diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java
index fda563f8f..8bf954af6 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java
@@ -22,6 +22,7 @@ public interface StatusResource {
     String EXCLUDED_STATUS_PARAM = "excluded";
 
     String APPROVER_ID_REQUEST_PARAM = "approverId";
+    String REVIEWER_ID_REQUEST_PARAM = "reviewerId";
 
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
@@ -47,7 +48,7 @@ public interface StatusResource {
 
     @PostMapping(value = STATUS_PATH + "/reviewer" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     void setCurrentFileReviewer(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId,
-                                @RequestBody JSONPrimitive<String> currentReviewer);
+                                @RequestParam(value = APPROVER_ID_REQUEST_PARAM, required =false) String reviewerId);
 
 
     @PostMapping(value = STATUS_PATH + "/underreview" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java
index 69e0ff618..2410c6cc7 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java
@@ -24,7 +24,7 @@ public class ManualRedactionEntryEntity {
     private AnnotationEntityId id;
     @Column(name = "user_id")
     private String user;
-    @Column
+    @Column(length = 4000)
     private String typeId;
     @Column
     private String value;
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
index 4c3785bf4..4889ea3b6 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
@@ -276,7 +276,7 @@ public class FileStatusPersistenceService {
         fileRepository.findById(fileId).ifPresentOrElse((file) -> {
             file.setCurrentReviewer(currentReviewer);
             file.setLastReviewer(lastReviewer);
-            file.setStatus(FileStatus.UNDER_REVIEW);
+            file.setStatus(currentReviewer == null ? FileStatus.UNASSIGNED :FileStatus.UNDER_REVIEW);
         }, () -> {
             throw new NotFoundException("Unknown file=" + fileId);
         });
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java
index 8f9b6364d..30a6519cc 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java
@@ -3,7 +3,6 @@ package com.iqser.red.service.peristence.v1.server.controller;
 import com.iqser.red.service.peristence.v1.server.service.*;
 import com.iqser.red.service.peristence.v1.server.utils.FileModelMapper;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileStatus;
 import com.iqser.red.service.persistence.service.v1.api.resources.StatusResource;
@@ -70,10 +69,10 @@ public class FileStatusController implements StatusResource {
     @Override
     public void setCurrentFileReviewer(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
                                        @PathVariable(FILE_ID) String fileId,
-                                       @RequestBody JSONPrimitive<String> currentFileReviewerRequest) {
+                                       @RequestParam(value = REVIEWER_ID_REQUEST_PARAM, required = false) String reviewerId) {
 
-        fileStatusService.setCurrentReviewer(dossierId, fileId, currentFileReviewerRequest.getValue());
-        fileStatusService.setStatusSuccessful(fileId, FileStatus.UNDER_REVIEW);
+        fileStatusService.setCurrentReviewer(dossierId, fileId, reviewerId);
+        fileStatusService.setStatusSuccessful(fileId, reviewerId != null ? FileStatus.UNDER_REVIEW : FileStatus.UNASSIGNED);
         analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
     }
 
@@ -85,7 +84,7 @@ public class FileStatusController implements StatusResource {
         FileEntity fileStatus = fileStatusService.getStatus(fileId);
         String lastReviewer = fileStatus.getLastReviewer();
         fileStatusService.setCurrentReviewer(dossierId, fileId, lastReviewer);
-        fileStatusService.setStatusSuccessful(fileId, FileStatus.UNDER_REVIEW);
+        fileStatusService.setStatusSuccessful(fileId, lastReviewer != null ? FileStatus.UNDER_REVIEW : FileStatus.UNASSIGNED);
         analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
     }
 
@@ -97,10 +96,8 @@ public class FileStatusController implements StatusResource {
 
         var dossier = dossierService.getDossierById(dossierId);
 
-        String dossierOwner = dossier.getOwnerId();
-
-        fileStatusService.setCurrentReviewer(dossierId, fileId, approverId != null ? approverId : dossierOwner);
-        fileStatusService.setStatusSuccessful(fileId, FileStatus.UNDER_APPROVAL);
+        fileStatusService.setCurrentReviewer(dossierId, fileId, approverId);
+        fileStatusService.setStatusSuccessful(fileId, approverId != null ? FileStatus.UNDER_APPROVAL : FileStatus.UNASSIGNED);
         analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
     }