Pull request #340 : RED-3363: Fixed ignored hints in full analysis

Merge in RED/redaction-service from RED-3363 to release/2.52.x * commit '0cb127eccbf496bcbbb17aa8b4de51c13aa9d3ea': RED-3363: Fixed ignored hints in full analysis
RED-3363: Fixed ignored hints in full analysis
2022-02-07 13:27:54 +01:00 · 2022-02-07 13:00:54 +01:00 · 2022-01-26 10:52:12 +01:00 · 2022-01-26 10:40:47 +01:00 · 2021-12-22 09:30:35 +01:00 · 2021-12-22 09:21:59 +01:00
90 changed files with 3612 additions and 1102 deletions
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.atlassian.bamboo</groupId>
    <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.1.2</version>
+    <version>7.2.2</version>
    <relativePath/>
  </parent>

@@ -21,6 +21,8 @@ import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
 import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
 import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
 import com.atlassian.bamboo.specs.util.BambooServer;
+import com.atlassian.bamboo.specs.builders.task.ScriptTask;
+import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;

 import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;

@@ -84,27 +86,18 @@ public class PlanSpec {
                                                .checkoutItems(new CheckoutItem().defaultRepository()),
                                        new ScriptTask()
                                                .description("Build")
-                                                .environmentVariables("MAVEN_OPTS="+JVM_ARGS)
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\n" +
-
-                                                        "export MAVEN_OPTS=\"$MAVEN_OPTS "+JVM_ARGS +"\"\n" +
-
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
-
-                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean install -Djava.security.egd=file:/dev/./urandom; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean deploy -e -DdeployAtEnd=true -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases; fi\n" +
-
-                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml package\n" +
-                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml docker:push\n" +
-
-                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then echo \"gitTag=${bamboo.planRepository.1.branch}_${bamboo.buildNumber}\" > git.tag; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then echo \"gitTag=${bamboo.version_tag}\" > git.tag; fi\n"),
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
+                                                .argument(SERVICE_NAME),
                                        createJUnitParserTask()
                                                .description("Resultparser")
                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
                                                .enabled(true),
+                                        new ScriptTask()
+                                                .description("Sonar")
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
+                                                .argument(SERVICE_NAME),
                                        new InjectVariablesTask()
                                                .description("Inject git Tag")
                                                .path("git.tag")
@@ -0,0 +1,51 @@
+#!/bin/bash
+set -e
+
+SERVICE_NAME=$1
+
+if [[ "${bamboo_version_tag}" = "dev" ]]
+then 
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+        --no-transfer-progress \
+        clean install \
+        -Djava.security.egd=file:/dev/./urandomelse
+else        
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+        --no-transfer-progress \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+        versions:set \
+        -DnewVersion=${bamboo_version_tag}
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+        --no-transfer-progress \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
+        versions:set  \
+        -DnewVersion=${bamboo_version_tag}
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+        --no-transfer-progress \
+        clean deploy \
+        -e \
+        -DdeployAtEnd=true \
+        -Dmaven.wagon.http.ssl.insecure=true \
+        -Dmaven.wagon.http.ssl.allowall=true \
+        -Dmaven.wagon.http.ssl.ignore.validity.dates=true \
+        -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases
+fi
+
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+    --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
+    package
+
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+    --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
+    docker:push
+
+if [[ "${bamboo_version_tag}" = "dev" ]]
+then 
+    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
+else
+    echo "gitTag=${bamboo_version_tag}" > git.tag
+fi
@@ -0,0 +1,42 @@
+#!/bin/bash
+set -e
+
+SERVICE_NAME=$1
+
+echo "dependency-check:aggregate"
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+    --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+    org.owasp:dependency-check-maven:aggregate
+
+if [[ -z "${bamboo_repository_pr_key}" ]]
+then
+    echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+            --no-transfer-progress \
+            -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+            sonar:sonar \
+            -Dsonar.projectKey=RED_$SERVICE_NAME \
+            -Dsonar.host.url=https://sonarqube.iqser.com \
+            -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
+            -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
+            -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
+            -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
+            -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+
+else
+    echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+            --no-transfer-progress \
+            -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+            sonar:sonar \
+            -Dsonar.projectKey=RED_$SERVICE_NAME \
+            -Dsonar.host.url=https://sonarqube.iqser.com \
+            -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
+            -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
+            -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
+            -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
+            -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
+            -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
+            -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+fi
@@ -6,6 +6,7 @@
        <groupId>com.iqser.red</groupId>
        <artifactId>platform-docker-dependency</artifactId>
        <version>1.0.0</version>
+        <relativePath />
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -13,6 +13,7 @@ RUN apt-get update \
    wget cabextract xfonts-utils fonts-liberation \
 && rm -rf /var/lib/apt/lists/*

-RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.7_all.deb -o /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && dpkg -i /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && rm /tmp/ttf-mscorefonts-installer_3.7_all.deb \
+RUN curl http://ftp.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb -o /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && dpkg -i /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && rm /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+
@@ -5,7 +5,8 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.1.2</version>
+        <version>1.1.3.3</version>
+        <relativePath />
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -32,7 +33,7 @@
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.3.1</version>
+                <version>1.3.6</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>configuration-service-api-v1</artifactId>
-            <version>2.7.0</version>
+            <version>2.11.0</version>
            <exclusions>
                <exclusion>
                    <groupId>com.iqser.red.service</groupId>
@@ -6,6 +6,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

 import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;

@Data
@Builder
@@ -13,12 +17,20 @@ import java.time.OffsetDateTime;
@AllArgsConstructor
 public class AnalyzeRequest {

-    private String projectId;
+    private String dossierId;
    private String fileId;
-    private String ruleSetId;
+    private String dossierTemplateId;
    private boolean reanalyseOnlyIfPossible;
    private ManualRedactions manualRedactions;
    private OffsetDateTime lastProcessed;

+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
+    @Builder.Default
+    private Set<Integer> sectionsToReanalyse = new HashSet<>();
+
+    @Builder.Default
+    private List<FileAttribute> fileAttributes = new ArrayList<>();
+
 }

@@ -11,20 +11,20 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class AnalyzeResult {

-    private String projectId;
+    private String dossierId;
    private String fileId;
    private long duration;
    private int numberOfPages;
-    private boolean hasHints;
-    private boolean hasRequests;
-    private boolean hasRedactions;
-    private boolean hasImages;
    private boolean hasUpdates;
    private long dictionaryVersion;
    private long dossierDictionaryVersion;
    private long rulesVersion;
    private long legalBasisVersion;

+    private boolean wasReanalyzed;
+
+    private int analysisVersion;
+

 }

@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class AnnotateRequest {

-    private String projectId;
+    private String dossierId;
+    private String dossierTemplateId;
    private String fileId;
 }
@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileAttribute {
+
+    private String id;
+    private String label;
+    private String placeholder;
+    private String value;
+
+}
@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.time.OffsetDateTime;
+
@Data
@Builder
@AllArgsConstructor
@@ -16,4 +18,8 @@ public class IdRemoval {
    private Status status;
    private boolean removeFromDictionary;

-}
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}
@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.time.OffsetDateTime;
+
@Data
@Builder
@AllArgsConstructor
@@ -16,4 +18,8 @@ public class ManualForceRedact {
    private Status status;
    private String legalBasis;

-}
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}
@@ -0,0 +1,25 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ManualImageRecategorization {
+
+    private String id;
+    private String user;
+    private Status status;
+    private String type;
+
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}
@@ -0,0 +1,27 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ManualLegalBasisChange {
+
+    private String id;
+    private String user;
+    private Status status;
+    private String legalBasis;
+    private String section;
+    private String value;
+
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}
@@ -5,6 +5,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;

@@ -22,11 +23,14 @@ public class ManualRedactionEntry {
    private String legalBasis;
    private List<Rectangle> positions = new ArrayList<>();
    private Status status;
-    private boolean addToDictionary;
-
    private String section;
-    private int sectionNumber;
+    private boolean rectangle;

+    private boolean addToDictionary;
    private boolean addToDossierDictionary;

+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
 }
@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;

 public enum ManualRedactionType {
-    ADD, REMOVE, FORCE_REDACT
+    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE
 }
@@ -26,6 +26,12 @@ public class ManualRedactions {
    @Builder.Default
    private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();

+    @Builder.Default
+    private Set<ManualImageRecategorization> imageRecategorizations = new HashSet<>();
+
+    @Builder.Default
+    private Set<ManualLegalBasisChange> manualLegalBasisChanges = new HashSet<>();
+
    @Builder.Default
    private Map<String, List<Comment>> comments = new HashMap<>();

@@ -15,8 +15,8 @@ public class RedactionChangeLog {
    private List<RedactionChangeLogEntry> redactionLogEntry = new ArrayList<>();

    private long dictionaryVersion = -1;
+    private long dossierDictionaryVersion = -1;
    private long rulesVersion = -1;
-
-    private String ruleSetId;
+    private long legalBasisVersion = -1;

 }
@@ -44,4 +44,6 @@ public class RedactionChangeLogEntry {

    private boolean isDossierDictionaryEntry;

+    private boolean excluded;
+
 }
@@ -10,18 +10,19 @@ import java.util.List;
@AllArgsConstructor
 public class RedactionLog {

+
+    /**
+     * Version 0 Redaction Logs have manual redactions merged inside them
+     * Version 1 Redaction Logs only contain system ( rule/dictionary ) redactions. Manual Redactions are merged in at runtime.
+     */
+    private long analysisVersion;
+
    private List<RedactionLogEntry> redactionLogEntry;
    private List<LegalBasisMapping> legalBasis;

-    private String ruleSetId;
-
    private long dictionaryVersion = -1;
-    private long rulesVersion = -1;
    private long dossierDictionaryVersion = -1;
+    private long rulesVersion = -1;
    private long legalBasisVersion = -1;

-
-
-
-
 }
@@ -9,17 +9,20 @@ import lombok.NoArgsConstructor;
 import java.util.ArrayList;
 import java.util.List;

+
+
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@EqualsAndHashCode(of = "id")
+@EqualsAndHashCode
 public class RedactionLogEntry {

    private String id;
    private String type;
    private String value;
    private String reason;
+    private boolean rectangle;
    private int matchedRule;
    private String legalBasis;
    private boolean redacted;
@@ -28,12 +31,18 @@ public class RedactionLogEntry {
    private String section;
    private float[] color;

+    private boolean hasBeenRecategorized;
+    private boolean hasLegalBasisChanged;
+    private boolean hasBeenForced;
+    private boolean hasBeenRemovedByManualOverride;
+
    @Builder.Default
    private List<Rectangle> positions = new ArrayList<>();
    private int sectionNumber;
    private boolean manual;
    private Status status;
    private ManualRedactionType manualRedactionType;
+    private String manualRedactionUserId;
    private boolean isDictionaryEntry;

    private String textBefore;
@@ -46,7 +55,13 @@ public class RedactionLogEntry {
    private int endOffset;

    private boolean isImage;
+    private boolean imageHasTransparency;

    private boolean isDossierDictionaryEntry;

+    private boolean excluded;
+
+    private String recategorizationType;
+    private String legalBasisChangeValue;
+
 }
@@ -1,5 +1,8 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.HashSet;
+import java.util.Set;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,8 +14,12 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class RedactionRequest {

-    private String projectId;
+    private String dossierId;
    private String fileId;
-    private String ruleSetId;
+    private String dossierTemplateId;
    private ManualRedactions manualRedactions;
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
+
+    private boolean withSectionDataForManualRedactions;
 }
@@ -27,7 +27,11 @@ public class SectionArea {
    private String header;

    public boolean contains(Rectangle other) {
-        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft().getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft().getY() + other.getHeight();
+        return page == other.getPage()
+                && topLeft.getX() <= other.getTopLeft().getX()
+                && topLeft.getX() + getWidth() >= other.getTopLeft().getX() + other.getWidth()
+                && getTopLeft().getY() <= other.getTopLeft().getY()
+                && getTopLeft().getY() + getHeight() >= other.getTopLeft().getY() + other.getHeight();
    }

 }
@@ -3,10 +3,9 @@ package com.iqser.red.service.redaction.v1.model;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;

@Data
@AllArgsConstructor
@@ -15,4 +14,16 @@ public class SectionGrid {

    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();

+    private List<SectionGridSection> sections = new ArrayList<>();
+
+    @Data
+    @RequiredArgsConstructor
+    public static class SectionGridSection {
+
+        private final int sectionNumber;
+        private final String headline;
+        private final Set<Integer> pages;
+        private final List<SectionArea> sectionAreas;
+
+    }
 }
@@ -1,10 +1,6 @@
 package com.iqser.red.service.redaction.v1.model;

-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
+import lombok.*;

 import java.util.List;

@@ -30,4 +26,12 @@ public class SectionRectangle {
    private int numberOfParts;

    private List<CellRectangle> tableCells;
+
+    public boolean contains(Rectangle other) {
+        return topLeft.getX() <= other.getTopLeft().getX()
+                && topLeft.getX() + getWidth() >= other.getTopLeft().getX() + other.getWidth()
+                && getTopLeft().getY() <= other.getTopLeft().getY()
+                && getTopLeft().getY() + getHeight() >= other.getTopLeft().getY() + other.getHeight();
+
+    }
 }
@@ -8,12 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;

 public interface RedactionResource {

-    String SERVICE_NAME = "redaction-service-v1";
-
-    String RULE_SET_PARAMETER_NAME = "ruleSetId";
-    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";
-
-
    @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);

@@ -26,10 +20,10 @@ public interface RedactionResource {
    @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);

-    @PostMapping(value = "/rules/update" + RULE_SET_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId);
-
    @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
    void testRules(@RequestBody String rules);

+    @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
+    RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);
+
 }
@@ -24,7 +24,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>file-management-service-api-v1</artifactId>
-            <version>2.7.4</version>
+            <version>2.80.15</version>
            <exclusions>
                <exclusion>
                    <groupId>com.iqser.red.service</groupId>
@@ -0,0 +1,6 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+public enum Orientation {
+
+    NONE, LEFT, RIGHT
+}
@@ -30,6 +30,8 @@ public class Page {
    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();

+    private double cropBoxArea;
+

    public boolean isRotated() {

@@ -32,6 +32,7 @@ public class TextBlock extends AbstractTextContainer {

    private String classification;

+
    public TextBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation) {
        this.minX = minX;
        this.maxX = maxX;
@@ -1,6 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;

+import static java.util.stream.Collectors.toSet;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.StringFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -11,16 +14,25 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+
 import org.springframework.stereotype.Service;

 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;

@Service
@SuppressWarnings("all")
 public class BlockificationService {

-    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
+    static final float THRESHOLD = 1f;
+
+
+    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines,
+                         List<Ruling> verticalRulingLines) {
+
+        sortRotatedSequences(textPositions);

        List<TextPositionSequence> chunkWords = new ArrayList<>();
        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();
@@ -28,21 +40,42 @@ public class BlockificationService {
        float minX = 1000, maxX = 0, minY = 1000, maxY = 0;
        TextPositionSequence prev = null;

+        boolean wasSplitted = false;
+        Float splitX1 = null;
        for (TextPositionSequence word : textPositions) {

            boolean lineSeparation = minY - word.getY2() > word.getHeight() * 1.25;
            boolean startFromTop = word.getY1() > maxY + word.getHeight();
+            boolean splitByX = prev != null && maxX + 50 < word.getX1() && prev.getY1() == word.getY1();
+            boolean newLineAfterSplit = prev != null && word.getY1() != prev.getY1() && wasSplitted && splitX1 != word.getX1();
+            boolean splittedByRuling = word.getRotation() == 0 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), verticalRulingLines) || word
+                    .getRotation() == 0 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), horizontalRulingLines) || word
+                    .getRotation() == 90 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), horizontalRulingLines) || word
+                    .getRotation() == 90 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), verticalRulingLines);

-            if (prev != null && (lineSeparation || startFromTop || word.getRotation() == 0 && isSplittedByRuling(maxX, minY, word
-                    .getX1(), word.getY1(), verticalRulingLines) || word.getRotation() == 0 && isSplittedByRuling(minX, minY, word
-                    .getX1(), word.getY2(), horizontalRulingLines) || word.getRotation() == 90 && isSplittedByRuling(maxX, minY, word
-                    .getX1(), word.getY1(), horizontalRulingLines) || word.getRotation() == 90 && isSplittedByRuling(minX, minY, word
-                    .getX1(), word.getY2(), verticalRulingLines))) {
+            if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling)) {
+
+                Orientation prevOrientation = null;
+                if (!chunkBlockList1.isEmpty()) {
+                    prevOrientation = chunkBlockList1.get(chunkBlockList1.size() - 1).getOrientation();
+                }

                TextBlock cb1 = buildTextBlock(chunkWords);
                chunkBlockList1.add(cb1);
                chunkWords = new ArrayList<>();

+                if (splitByX && !splittedByRuling) {
+                    wasSplitted = true;
+                    cb1.setOrientation(Orientation.LEFT);
+                    splitX1 = word.getX1();
+                } else if (newLineAfterSplit && !splittedByRuling) {
+                    wasSplitted = false;
+                    cb1.setOrientation(Orientation.RIGHT);
+                    splitX1 = null;
+                } else if (prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)) {
+                    cb1.setOrientation(Orientation.LEFT);
+                }
+
                minX = 1000;
                maxX = 0;
                minY = 1000;
@@ -72,10 +105,66 @@ public class BlockificationService {
            chunkBlockList1.add(cb1);
        }

+        Iterator<AbstractTextContainer> itty = chunkBlockList1.iterator();
+
+        TextBlock previousLeft = null;
+        TextBlock previousRight = null;
+        while (itty.hasNext()) {
+            TextBlock block = (TextBlock) itty.next();
+
+            if (previousLeft != null && block.getOrientation().equals(Orientation.LEFT)) {
+                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft
+                        .getMinY()) {
+                    previousLeft.add(block);
+                    itty.remove();
+                    continue;
+                }
+            }
+
+            if (previousRight != null && block.getOrientation().equals(Orientation.RIGHT)) {
+                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight
+                        .getMinY()) {
+                    previousRight.add(block);
+                    itty.remove();
+                    continue;
+                }
+            }
+
+            if (block.getOrientation().equals(Orientation.LEFT)) {
+                previousLeft = block;
+            } else if (block.getOrientation().equals(Orientation.RIGHT)) {
+                previousRight = block;
+            }
+        }
+
+        itty = chunkBlockList1.iterator();
+        TextBlock previous = null;
+        while (itty.hasNext()) {
+            TextBlock block = (TextBlock) itty.next();
+
+            if (previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation()
+                    .equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY()) || previous != null && previous
+                    .getOrientation()
+                    .equals(Orientation.LEFT) && block.getOrientation()
+                    .equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY())) {
+                previous.add(block);
+                itty.remove();
+                continue;
+            }
+
+            previous = block;
+        }
+
        return new Page(chunkBlockList1);
    }


+    private boolean equalsWithThreshold(float f1, float f2) {
+
+        return Math.abs(f1 - f2) < THRESHOLD;
+    }
+
+
    private TextBlock buildTextBlock(List<TextPositionSequence> wordBlockList) {

        TextBlock textBlock = null;
@@ -113,11 +202,19 @@ public class BlockificationService {
            textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
        }

+        if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences()
+                .stream()
+                .map(t -> round(t.getY1(), 3))
+                .collect(toSet())
+                .size() == 1) {
+            textBlock.getSequences().sort(Comparator.comparing(TextPositionSequence::getX1));
+        }
        return textBlock;
    }


-    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List<Ruling> rulingLines) {
+    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1,
+                                       List<Ruling> rulingLines) {

        for (Ruling ruling : rulingLines) {
            if (ruling.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
@@ -128,7 +225,8 @@ public class BlockificationService {
    }


-    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
+    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter,
+                                            boolean landscape) {

        float minX = 10000;
        float maxX = -100;
@@ -205,4 +303,30 @@ public class BlockificationService {
        return new Rectangle(minY, minX, maxX - minX, maxY - minY);
    }

+
+    private void sortRotatedSequences(List<TextPositionSequence> sequences) {
+
+        List<TextPositionSequence> rotatedWords = new ArrayList<>();
+        Iterator<TextPositionSequence> itty = sequences.iterator();
+        while (itty.hasNext()) {
+            var pos = itty.next();
+            if (pos.getTextPositions().get(0).getDir() == 270) {
+                rotatedWords.add(pos);
+                itty.remove();
+            }
+        }
+
+        if (!rotatedWords.isEmpty() && !sequences.isEmpty()) {
+            rotatedWords.sort(Comparator.comparing(TextPositionSequence::getX1));
+        }
+        sequences.addAll(rotatedWords);
+    }
+
+
+    private double round(float value, int decimalPoints) {
+
+        var d = Math.pow(10, decimalPoints);
+        return Math.round(value * d) / d;
+    }
+
 }
@@ -73,8 +73,10 @@ public class ClassificationService {
            }
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
                .getFontSizeCounter()
-                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
-                .equals("bold")) {
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && (textBlock.getMostPopularWordStyle()
+                .equals("bold") || !document.getFontStyleCounter().getCountPerValue().containsKey("bold") && textBlock.getMostPopularWordFontSize() > document
+                .getFontSizeCounter()
+                .getMostPopular() + 1) && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {

            for (int i = 1; i <= headlineFontSizes.size(); i++) {
                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -86,7 +88,7 @@ public class ClassificationService {
                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
                .equals("bold") && !document.getFontStyleCounter()
                .getMostPopular()
-                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9 && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
            document.setHeadlines(true);
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.controller;

 import com.iqser.red.commons.spring.ErrorMessage;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionLogNotFoundException;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -17,6 +18,13 @@ public class ControllerAdvice {

    /* error handling */

+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+    @ExceptionHandler(value = RedactionLogNotFoundException.class)
+    public ErrorMessage handleRedactionLogNotFoundException(RedactionLogNotFoundException e) {
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
    @ResponseBody
    @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
    @ExceptionHandler(value = NullPointerException.class)
@@ -1,17 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.controller;

 import com.iqser.red.service.file.management.v1.api.model.FileType;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionLogNotFoundException;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
@@ -21,12 +20,12 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.stream.Collectors;

@Slf4j
@RestController
@@ -39,18 +38,18 @@ public class RedactionController implements RedactionResource {
    private final AnnotationService annotationService;
    private final PdfSegmentationService pdfSegmentationService;
    private final RedactionStorageService redactionStorageService;
-
+    private final RedactionLogMergeService redactionLogMergeService;

    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {

-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getProjectId(), annotateRequest.getFileId(), FileType.ORIGIN));
-        var redactionLog = redactionStorageService.getRedactionLog(annotateRequest.getProjectId(), annotateRequest.getFileId());
-        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getProjectId(), annotateRequest.getFileId());
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
+        var redactionLog = redactionStorageService.getRedactionLog(annotateRequest.getDossierId(), annotateRequest.getFileId());
+        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());

        try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
            pdDocument.setAllSecurityToBeRemoved(true);

-            dictionaryService.updateDictionary(redactionLog.getRuleSetId(), annotateRequest.getProjectId());
+            dictionaryService.updateDictionary(annotateRequest.getDossierTemplateId(), annotateRequest.getDossierId());
            annotationService.annotate(pdDocument, redactionLog, sectionsGrid);

            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
@@ -66,11 +65,11 @@ public class RedactionController implements RedactionResource {

    @Override
    public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
        try {
            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);

-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
                pdDocument.setAllSecurityToBeRemoved(true);

@@ -91,11 +90,11 @@ public class RedactionController implements RedactionResource {

    @Override
    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
        try {
            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);

-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
                pdDocument.setAllSecurityToBeRemoved(true);

@@ -120,7 +119,7 @@ public class RedactionController implements RedactionResource {
        Document classifiedDoc;

        try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true);
        } catch (Exception e) {
            throw new RedactionException(e);
@@ -141,20 +140,53 @@ public class RedactionController implements RedactionResource {

    }

-
-    @Override
-    public void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId) {
-
-        droolsExecutionService.updateRules(ruleSetId);
-    }
-
-
    @Override
    public void testRules(@RequestBody String rules) {

        droolsExecutionService.testRules(rules);
    }

+    @Override
+    public RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest) {
+
+        log.info("Requested preview for: {}", redactionRequest);
+        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());
+
+        SectionGrid sectionGrid = null;
+        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
+
+        if (redactionLog == null) {
+            throw new RedactionLogNotFoundException();
+        }
+
+
+        if (redactionRequest.isWithSectionDataForManualRedactions()) {
+            sectionGrid = redactionStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest.getFileId());
+            if (sectionGrid.getSections().isEmpty()) {
+
+                log.info("SectionGrid does not have headlines set. Computing headlines now!");
+                var text = redactionStorageService.getText(redactionRequest.getDossierId(), redactionRequest.getFileId());
+
+                // enhance section grid with headline data
+                for (var sectionText : text.getSectionTexts()) {
+                    sectionGrid.getSections().add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(),
+                            sectionText.getHeadline(),
+                            sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()),
+                            sectionText.getSectionAreas()));
+                }
+                redactionStorageService.storeObject(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.SECTION_GRID, sectionGrid);
+            }
+        }
+
+
+        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
+        if (redactionLog.getAnalysisVersion() == 0) {
+            // old redaction logs are returned directly
+            return redactionLog;
+        } else {
+            return redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
+        }
+    }

    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {

@@ -0,0 +1,9 @@
+package com.iqser.red.service.redaction.v1.server.exception;
+
+public class RedactionLogNotFoundException extends RuntimeException {
+
+    public RedactionLogNotFoundException() {
+        super("RedactionLog not found!");
+    }
+
+}
@@ -46,6 +46,17 @@ public class PDFAreaTextStripper extends PDFTextStripperByArea {
                startIndex = i;
            }

+
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
+                List<TextPosition> sublist = textPositions.subList(startIndex, i);
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                }
+                startIndex = i;
+            }
+
            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
@@ -1,16 +1,33 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.pdfbox.contentstream.operator.Operator;
 import org.apache.pdfbox.contentstream.operator.OperatorName;
-import org.apache.pdfbox.contentstream.operator.color.*;
-import org.apache.pdfbox.contentstream.operator.state.*;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.state.SetFlatness;
+import org.apache.pdfbox.contentstream.operator.state.SetLineCapStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineDashPattern;
+import org.apache.pdfbox.contentstream.operator.state.SetLineJoinStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineMiterLimit;
+import org.apache.pdfbox.contentstream.operator.state.SetLineWidth;
+import org.apache.pdfbox.contentstream.operator.state.SetRenderingIntent;
 import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
@@ -23,12 +40,14 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 import org.apache.pdfbox.util.Matrix;

-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {
@@ -189,18 +208,19 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            COSName objectName = (COSName) arguments.get(0);
            PDXObject xobject = getResources().getXObject(objectName);
            if (xobject instanceof PDImageXObject) {
-                PDImageXObject pdfImage = (PDImageXObject) xobject;
+                PDImageXObject image = (PDImageXObject) xobject;
+                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();

-                Rectangle2D imageBounds = calculateImagePosition(pdfImage);
-
-                Rectangle2D rect = new Rectangle2D.Float((float) imageBounds.getX(), (float) imageBounds.getY(), (float) imageBounds
-                        .getWidth(), (float) imageBounds.getHeight());
+                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew
+                        .getScaleY());

                // Memory Hack - sofReference kills me
-                FieldUtils.writeField(pdfImage, "cachedImageSubsampling", -1, true);
+                FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);

                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(pdfImage.getImage(), rect, pageNumber));
+                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage()
+                            .getColorModel()
+                            .hasAlpha()));
                }
            }
        } catch (Exception e) {
@@ -209,23 +229,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    }


-    private Rectangle2D calculateImagePosition(PDImageXObject pdfImage) throws IOException {
-
-        Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
-
-        Rectangle2D imageBounds = pdfImage.getImage().getRaster().getBounds();
-
-        AffineTransform imageTransform = new AffineTransform(ctm.createAffineTransform());
-        imageTransform.scale(1.0 / pdfImage.getWidth(), -1.0 / pdfImage.getHeight());
-        imageTransform.translate(0, -pdfImage.getHeight());
-
-        AffineTransform pageTransform = new AffineTransform();
-        pageTransform.concatenate(imageTransform);
-
-        return pageTransform.createTransformedShape(imageBounds).getBounds2D();
-    }
-
-
    private float floatValue(COSBase value) {

        if (value instanceof COSNumber) {
@@ -264,8 +267,16 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    public void writeString(String text, List<TextPosition> textPositions) throws IOException {

        int startIndex = 0;
+        RedTextPosition previous = null;
+
        for (int i = 0; i <= textPositions.size() - 1; i++) {

+            if (!textPositionSequences.isEmpty()) {
+                previous = textPositionSequences.get(textPositionSequences.size() - 1)
+                        .getTextPositions()
+                        .get(textPositionSequences.get(textPositionSequences.size() - 1).getTextPositions().size() - 1);
+            }
+
            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
            if (charWidth < minCharWidth) {
                minCharWidth = charWidth;
@@ -284,17 +295,30 @@ public class PDFLinesTextStripper extends PDFTextStripper {

            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
-                    .equals("\u00A0"))) {
+                    .equals("\u00A0") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\t"))) {
                startIndex++;
                continue;
            }

            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
-            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
+            if (i > 0 && textPositions.get(i).getXDirAdj() < textPositions.get(i - 1).getXDirAdj()) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                }
+                startIndex = i;
+            }
+
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i)
+                    .getX() > textPositions.get(i - 1).getEndX() + 1) {
+                List<TextPosition> sublist = textPositions.subList(startIndex, i);
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i;
@@ -302,12 +326,23 @@ public class PDFLinesTextStripper extends PDFTextStripper {

            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
-                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
+                    .equals("\u00A0") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\t")) && i <= textPositions.size() - 2) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
+
+                    // Remove false sequence ends (whitespaces)
+                    if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                            .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                        for (TextPosition t : sublist) {
+                            textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                        }
+                    } else {
+                        textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                    }
                }
                startIndex = i + 1;
            }
@@ -316,13 +351,23 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
                .getUnicode()
-                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
+                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0") || sublist.get(sublist.size() - 1).getUnicode().equals("\t"))) {
            sublist = sublist.subList(0, sublist.size() - 1);
        }
+
        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
                .getUnicode()
-                .equals("\u00A0")))) {
-            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                .equals("\u00A0") || sublist.get(0)
+                .getUnicode()
+                .equals("\t")))) {
+            if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                    .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                for (TextPosition t : sublist) {
+                    textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                }
+            } else {
+                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+            }
        }
        super.writeString(text);
    }
@@ -21,6 +21,8 @@ public class RedTextPosition {
    private float YDirAdj;
    private float width;
    private float heightDir;
+    private float widthDirAdj;
+    private float dir;

    // not used in reanalysis
    @JsonIgnore
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

+import static java.util.stream.Collectors.toSet;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.iqser.red.service.redaction.v1.model.Point;
@@ -136,6 +138,13 @@ public class TextPositionSequence implements CharSequence {
    }


+    @JsonIgnore
+    public float getRotationAdjustedX() {
+
+        return textPositions.get(0).getXDirAdj();
+    }
+
+
    @JsonIgnore
    public float getY1() {

@@ -233,7 +242,7 @@ public class TextPositionSequence implements CharSequence {
        float posYInit;
        float posYEnd;

-        if (textPositions.get(0).getRotation() == 90) {
+        if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() != 0.0f) {
            posXEnd = textPositions.get(0).getYDirAdj() + 2;
            posYInit = getY1();
            posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
@@ -244,9 +253,31 @@ public class TextPositionSequence implements CharSequence {
            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
                    .getYDirAdj() + height;
-        } else {
+        } else if(textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 270f) {
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
+        } else if(textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 0.0f){
+            posXInit =  textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getHeightDir();
+            posXEnd = textPositions.get(0).getXDirAdj();
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + 2;
+        } else if(textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 90f){
+            posYInit =  getX1();
+            posYEnd =   getX2() + textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit =  textPositions.get(0).getYDirAdj() + 2;
+            posXEnd =  textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() - height;
+        }
+        else {
            posXEnd = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
                    .getYDirAdj() + 2;
@@ -21,7 +21,7 @@ public class MessagingConfiguration {

        return QueueBuilder.durable(REDACTION_QUEUE)
                .withArgument("x-dead-letter-exchange", "")
-                .withArgument("x-dead-letter-routing-key", REDACTION_QUEUE)
+                .withArgument("x-dead-letter-routing-key", REDACTION_DQL)
                .maxPriority(2)
                .build();
    }
@@ -38,7 +38,7 @@ public class RedactionMessageReceiver {
        }
        log.info("Successfully analyzed {}", analyzeRequest);

-        fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), result);
+        fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
    }

    @RabbitHandler
@@ -48,7 +48,7 @@ public class RedactionMessageReceiver {
        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
        log.info("Failed to process analyze request: {}", analyzeRequest);

-        fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getProjectId(), analyzeRequest.getFileId());
+        fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
    }

 }
@@ -10,7 +10,7 @@ import java.util.Map;
@Data
 public class DictionaryRepresentation {

-    private String ruleSetId;
+    private String dossierTemplateId;
    private long dictionaryVersion = -1;
    private List<DictionaryModel> dictionary = new ArrayList<>();
    private float[] defaultColor;
@@ -11,6 +11,6 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class DictionaryVersion {

-    long rulesetVersion;
+    long dossierTemplateVersion;
    long dossierVersion;
 }
@@ -9,7 +9,7 @@ import java.util.List;

@Data
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Entity {
+public class Entity implements ReasonHolder {


    private final String word;
@@ -39,6 +39,8 @@ public class Entity {

    private boolean isDossierDictionaryEntry;

+    private boolean ignored;
+

    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start, Integer end, boolean isDossierDictionaryEntry) {

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class Image {
+public class Image implements ReasonHolder {

    private String type;
    private RedRectangle2D position;
@@ -20,5 +20,7 @@ public class Image {
    private int sectionNumber;
    private String section;
    private int page;
+    private boolean ignored;
+    private boolean hasTransparency;

 }
@@ -18,14 +18,16 @@ public class PdfImage {
    private RedRectangle2D position;
    private ImageType imageType;
    private boolean isAppendedToParagraph;
+    private boolean hasTransparency;

    @NonNull
    private int page;

-    public PdfImage(BufferedImage image, Rectangle2D position, int page) {
+    public PdfImage(BufferedImage image, Rectangle2D position, int page, boolean hasTransparency) {
        this.image = image;
        this.position = new RedRectangle2D(position.getX(), position.getY(), position.getWidth(), position.getHeight());
        this.page = page;
+        this.hasTransparency = hasTransparency;
    }

 }
@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+public interface ReasonHolder {
+
+    String getRedactionReason();
+
+    void setRedactionReason(String reason);
+
+    boolean isRedaction();
+
+    void setRedaction(boolean value);
+
+
+}
@@ -11,6 +11,8 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class RedRectangle2D {

+    public static final double THRESHOLD = 0.01;
+
    private double x;
    private double y;
    private double width;
@@ -27,9 +29,14 @@ public class RedRectangle2D {
        }
        double x0 = getX();
        double y0 = getY();
-        return x >= x0 &&
-                y >= y0 &&
-                (x + w) <= x0 + getWidth() &&
-                (y + h) <= y0 + getHeight();
+        return round(x) >= round(x0) &&
+                round(y) >= round(y0) &&
+                (x + w) - (x0 + getWidth()) <= THRESHOLD &&
+                (y + h) - (y0 + getHeight()) <= THRESHOLD;
+    }
+
+    private double round(double value) {
+        double d = Math.pow(10, 2);
+        return Math.round(value * d) / d;
    }
 }
@@ -1,23 +1,28 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
-import lombok.Builder;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;

+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

-import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
+import org.apache.commons.lang3.StringUtils;
+
+import com.iqser.red.service.redaction.v1.model.FileAttribute;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;

@Data
@Slf4j
@@ -52,6 +57,63 @@ public class Section {
    @Builder.Default
    private Set<Image> images = new HashSet<>();

+    @Builder.Default
+    private List<FileAttribute> fileAttributes = new ArrayList<>();
+
+
+    public boolean fileAttributeByIdEquals(String id, String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    public boolean fileAttributeByPlaceholderEquals(String placeholder, String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    public boolean fileAttributeByLabelEquals(String label, String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    public boolean fileAttributeByIdEqualsIgnoreCase(String id, String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(String placeholder, String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    public boolean fileAttributeByLabelEqualsIgnoreCase(String label, String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+

    public boolean rowEquals(String headerName, String value) {

@@ -72,13 +134,13 @@ public class Section {

    public boolean matchesType(String type) {

-        return entities.stream().anyMatch(entity -> entity.getType().equals(type));
+        return entities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
    }


    public boolean matchesImageType(String type) {

-        return images.stream().anyMatch(image -> image.getType().equals(type));
+        return images.stream().anyMatch(image -> !image.isIgnored() &&  image.getType().equals(type));
    }


@@ -90,6 +152,18 @@ public class Section {

    public void expandByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group) {

+        expandByRegEx(type, pattern, patternCaseInsensitive, group, null);
+    }
+
+
+    public void expandByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group,
+                              String withoutPattern) {
+
+        Pattern compiledWithoutPattern = null;
+        if (withoutPattern != null) {
+            compiledWithoutPattern = Patterns.getCompiledPattern(withoutPattern, patternCaseInsensitive);
+        }
+
        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

        Set<Entity> expanded = new HashSet<>();
@@ -99,14 +173,21 @@ public class Section {
                continue;
            }

+            if (withoutPattern != null) {
+                Matcher matcherWithout = compiledWithoutPattern.matcher(entity.getWord());
+                if (matcherWithout.find()) {
+                    continue;
+                }
+            }
+
            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());

            while (matcher.find()) {
                String match = matcher.group(group);
-                if (StringUtils.isNotBlank(match)) {
-                    expanded.addAll(findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity
-                            .getRedactionReason(), entity.getLegalBasis()));

+                if (StringUtils.isNotBlank(match)) {
+                    Set<Entity> expandedEntities = findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity.getRedactionReason(), entity.getLegalBasis());
+                    expanded.addAll(EntitySearchUtils.findNonOverlappingMatchEntities(entities, expandedEntities));
                }
            }
        }
@@ -172,6 +253,12 @@ public class Section {
    }


+    public void ignore(String type) {
+
+        entities.removeIf(entity -> entity.getType().equals(type));
+    }
+
+
    public void expandToHintAnnotationByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group,
                                              String asType) {

@@ -4,46 +4,40 @@ import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

@Service
+@RequiredArgsConstructor
 public class AnalyzeResponseService {

-    public AnalyzeResult createAnalyzeResponse(String projectId, String fileId, long duration, int pageCount, RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
-        boolean hasHints = redactionLog.getRedactionLogEntry().stream().anyMatch(RedactionLogEntry::isHint);
+    private final RedactionServiceSettings redactionServiceSettings;

-        boolean hasRequests = redactionLog.getRedactionLogEntry()
-                .stream()
-                .anyMatch(entry -> entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.REQUESTED));
+    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount,
+                                               RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {

-        boolean hasRedactions = redactionLog.getRedactionLogEntry()
-                .stream()
-                .anyMatch(entry -> entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.APPROVED));
-
-        boolean hasImages = redactionLog.getRedactionLogEntry()
-                .stream()
-                .anyMatch(entry -> entry.isHint() && entry.getType().equals("image"));

        boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog
                .getRedactionLogEntry()
-                .isEmpty() && redactionChangeLog.getRedactionLogEntry().stream().anyMatch(entry -> !entry.getType().equals("false_positive"));
+                .isEmpty() && redactionChangeLog.getRedactionLogEntry()
+                .stream()
+                .anyMatch(entry -> !entry.getType().equals("false_positive"));

        return AnalyzeResult.builder()
-                .projectId(projectId)
+                .dossierId(dossierId)
                .fileId(fileId)
                .duration(duration)
                .numberOfPages(pageCount)
-                .hasHints(hasHints)
-                .hasRedactions(hasRedactions)
-                .hasRequests(hasRequests)
-                .hasImages(hasImages)
                .hasUpdates(hasUpdates)
+                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
                .rulesVersion(redactionLog.getRulesVersion())
                .dictionaryVersion(redactionLog.getDictionaryVersion())
                .legalBasisVersion(redactionLog.getLegalBasisVersion())
                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
                .build();
    }
+
 }
@@ -1,19 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import static com.iqser.red.service.configuration.v1.api.resource.DictionaryResource.GLOBAL_DOSSIER;
-
 import com.iqser.red.service.configuration.v1.api.model.Colors;
 import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
 import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
 import com.iqser.red.service.configuration.v1.api.model.TypeResult;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryRepresentation;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
-
+import com.iqser.red.service.redaction.v1.server.redaction.model.*;
 import feign.FeignException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +18,8 @@ import java.awt.Color;
 import java.util.*;
 import java.util.stream.Collectors;

+import static com.iqser.red.service.configuration.v1.api.resource.DictionaryResource.GLOBAL_DOSSIER;
+
@Slf4j
@Service
@RequiredArgsConstructor
@@ -32,37 +27,38 @@ public class DictionaryService {

    private final DictionaryClient dictionaryClient;

-    private final Map<String, DictionaryRepresentation> dictionariesByRuleSets = new HashMap<>();
+    private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
    private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();


-    public DictionaryVersion updateDictionary(String ruleSetId, String dossierId) {
+    public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {

-        long rulesetDictionaryVersion = dictionaryClient.getVersion(ruleSetId, GLOBAL_DOSSIER);
-        var rulesetDictionary = dictionariesByRuleSets.get(ruleSetId);
-        if (rulesetDictionary == null || rulesetDictionaryVersion > rulesetDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(ruleSetId, rulesetDictionaryVersion, GLOBAL_DOSSIER);
+        log.info("Updating dictionary data for: {} / {}", dossierTemplateId, dossierId);
+        long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId, GLOBAL_DOSSIER);
+        var dossierTemplateDictionary = dictionariesByDossierTemplate.get(dossierTemplateId);
+        if (dossierTemplateDictionary == null || dossierTemplateDictionaryVersion > dossierTemplateDictionary.getDictionaryVersion()) {
+            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, GLOBAL_DOSSIER);
        }

-        long dossierDictionaryVersion = dictionaryClient.getVersion(ruleSetId, dossierId);
+        long dossierDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId, dossierId);
        var dossierDictionary = dictionariesByDossier.get(dossierId);
        if (dossierDictionary == null || dossierDictionaryVersion > dossierDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(ruleSetId, dossierDictionaryVersion, dossierId);
+            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, dossierId);
        }

-        return DictionaryVersion.builder().rulesetVersion(rulesetDictionaryVersion).dossierVersion(dossierDictionaryVersion).build();
+        return DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateDictionaryVersion).dossierVersion(dossierDictionaryVersion).build();
    }


-    public DictionaryIncrement getDictionaryIncrements(String ruleSetId, DictionaryVersion fromVersion, String dossierId) {
+    public DictionaryIncrement getDictionaryIncrements(String dossierTemplateId, DictionaryVersion fromVersion, String dossierId) {

-        DictionaryVersion version = updateDictionary(ruleSetId, dossierId);
+        DictionaryVersion version = updateDictionary(dossierTemplateId, dossierId);

        Set<DictionaryIncrementValue> newValues = new HashSet<>();
-        List<DictionaryModel> dictionaryModels = dictionariesByRuleSets.get(ruleSetId).getDictionary();
+        List<DictionaryModel> dictionaryModels = dictionariesByDossierTemplate.get(dossierTemplateId).getDictionary();
        dictionaryModels.forEach(dictionaryModel -> {
            dictionaryModel.getEntries().forEach(dictionaryEntry -> {
-                if (dictionaryEntry.getVersion() > fromVersion.getRulesetVersion()) {
+                if (dictionaryEntry.getVersion() > fromVersion.getDossierTemplateVersion()) {
                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
                }
            });
@@ -83,35 +79,35 @@ public class DictionaryService {
    }


-    private void updateDictionaryEntry(String ruleSetId, long version, String dossierId) {
+    private void updateDictionaryEntry(String dossierTemplateId, long version, String dossierId) {

        try {
            DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();

-            TypeResponse typeResponse = dictionaryClient.getAllTypes(ruleSetId, dossierId);
+            TypeResponse typeResponse = dictionaryClient.getAllTypes(dossierTemplateId, dossierId);
            if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {

                List<DictionaryModel> dictionary = typeResponse.getTypes()
                        .stream()
                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                .isHint(), t.isRecommendation(), convertEntries(t, dossierId), new HashSet<>(),dossierId.equals(GLOBAL_DOSSIER) ? false : true))
+                                .isHint(), t.isRecommendation(), convertEntries(t, dossierId), new HashSet<>(), !dossierId.equals(GLOBAL_DOSSIER)))
                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                        .collect(Collectors.toList());

                dictionary.forEach(dm -> dictionaryRepresentation.getLocalAccessMap().put(dm.getType(), dm));

-                Colors colors = dictionaryClient.getColors(ruleSetId);
+                Colors colors = dictionaryClient.getColors(dossierTemplateId);

                dictionaryRepresentation.setDefaultColor(convertColor(colors.getDefaultColor()));
                dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAdd()));
                dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemove()));
                dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getNotRedacted()));
-                dictionaryRepresentation.setRuleSetId(ruleSetId);
+                dictionaryRepresentation.setDossierTemplateId(dossierTemplateId);
                dictionaryRepresentation.setDictionaryVersion(version);
                dictionaryRepresentation.setDictionary(dictionary);

                if(dossierId.equals(GLOBAL_DOSSIER)) {
-                    dictionariesByRuleSets.put(ruleSetId, dictionaryRepresentation);
+                    dictionariesByDossierTemplate.put(dossierTemplateId, dictionaryRepresentation);
                } else {
                    dictionariesByDossier.put(dossierId, dictionaryRepresentation);
                }
@@ -123,14 +119,14 @@ public class DictionaryService {
    }


-    public void updateExternalDictionary(Dictionary dictionary, String ruleSetId) {
+    public void updateExternalDictionary(Dictionary dictionary, String dossierTemplateId) {

        dictionary.getDictionaryModels().forEach(dm -> {
            if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
-                dictionaryClient.addEntries(dm.getType(), ruleSetId, new ArrayList<>(dm.getLocalEntries()), false, GLOBAL_DOSSIER);
-                long externalVersion = dictionaryClient.getVersion(ruleSetId, GLOBAL_DOSSIER);
-                if (externalVersion == dictionary.getVersion().getRulesetVersion() + 1) {
-                    dictionary.getVersion().setRulesetVersion(externalVersion);
+                dictionaryClient.addEntries(dm.getType(), dossierTemplateId, new ArrayList<>(dm.getLocalEntries()), false, GLOBAL_DOSSIER);
+                long externalVersion = dictionaryClient.getVersion(dossierTemplateId, GLOBAL_DOSSIER);
+                if (externalVersion == dictionary.getVersion().getDossierTemplateVersion() + 1) {
+                    dictionary.getVersion().setDossierTemplateVersion(externalVersion);
                }
            }
        });
@@ -139,7 +135,7 @@ public class DictionaryService {

    private Set<DictionaryEntry> convertEntries(TypeResult t, String dossierId) {

-        Set<DictionaryEntry> entries = new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId(), dossierId)
+        Set<DictionaryEntry> entries = new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getDossierTemplateId(), dossierId)
                .getEntries());

        if (t.isCaseInsensitive()) {
@@ -156,9 +152,9 @@ public class DictionaryService {
    }


-    public boolean isCaseInsensitiveDictionary(String type, String ruleSetId) {
+    public boolean isCaseInsensitiveDictionary(String type, String dossierTemplateId) {

-        DictionaryModel dictionaryModel = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        DictionaryModel dictionaryModel = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
        if (dictionaryModel != null) {
            return dictionaryModel.isCaseInsensitive();
        }
@@ -166,19 +162,20 @@ public class DictionaryService {
    }


-    public float[] getColor(String type, String ruleSetId) {
+    public float[] getColor(String type, String dossierTemplateId) {

-        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        log.info("requested : {} / {}",type,dossierTemplateId);
+        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.getColor();
        }
-        return dictionariesByRuleSets.get(ruleSetId).getDefaultColor();
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getDefaultColor();
    }


-    public boolean isHint(String type, String ruleSetId) {
+    public boolean isHint(String type, String dossierTemplateId) {

-        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.isHint();
        }
@@ -186,9 +183,9 @@ public class DictionaryService {
    }


-    public boolean isRecommendation(String type, String ruleSetId) {
+    public boolean isRecommendation(String type, String dossierTemplateId) {

-        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.isRecommendation();
        }
@@ -196,12 +193,12 @@ public class DictionaryService {
    }


-    public Dictionary getDeepCopyDictionary(String ruleSetId, String dossierId) {
+    public Dictionary getDeepCopyDictionary(String dossierTemplateId, String dossierId) {

        List<DictionaryModel> copy = new ArrayList<>();

-        var rulesetRepresentation = dictionariesByRuleSets.get(ruleSetId);
-        rulesetRepresentation.getDictionary().forEach(dm -> {
+        var dossierTemplateRepresentation = dictionariesByDossierTemplate.get(dossierTemplateId);
+        dossierTemplateRepresentation.getDictionary().forEach(dm -> {
            copy.add(SerializationUtils.clone(dm));
        });

@@ -215,25 +212,25 @@ public class DictionaryService {
            dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
        }

-        return new Dictionary(copy, DictionaryVersion.builder().rulesetVersion(rulesetRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
+        return new Dictionary(copy.stream().sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList()), DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
    }


-    public float[] getRequestRemoveColor(String ruleSetId) {
+    public float[] getRequestRemoveColor(String dossierTemplateId) {

-        return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestRemoveColor();
    }


-    public float[] getNotRedactedColor(String ruleSetId) {
+    public float[] getNotRedactedColor(String dossierTemplateId) {

-        return dictionariesByRuleSets.get(ruleSetId).getNotRedactedColor();
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getNotRedactedColor();
    }


-    public float[] getRequestAddColor(String ruleSetId) {
+    public float[] getRequestAddColor(String dossierTemplateId) {

-        return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
    }

 }
@@ -28,14 +28,14 @@ public class DroolsExecutionService {

    private final Map<String, KieContainer> kieContainers = new HashMap<>();

-    private final Map<String, Long> rulesVersionPerRuleSetId = new HashMap<>();
+    private final Map<String, Long> rulesVersionPerDossierTemplateId = new HashMap<>();


-    public KieContainer getKieContainer(String ruleSetId) {
+    public KieContainer getKieContainer(String dossierTemplateId) {

-        KieContainer container = kieContainers.get(ruleSetId);
+        KieContainer container = kieContainers.get(dossierTemplateId);
        if (container == null) {
-            return createOrUpdateKieContainer(ruleSetId);
+            return createOrUpdateKieContainer(dossierTemplateId);
        } else {
            return container;
        }
@@ -55,43 +55,43 @@ public class DroolsExecutionService {
    }


-    public KieContainer updateRules(String ruleSetId) {
+    public KieContainer updateRules(String dossierTemplateId) {

-        long version = rulesClient.getVersion(ruleSetId);
-        Long rulesVersion = rulesVersionPerRuleSetId.get(ruleSetId);
+        long version = rulesClient.getVersion(dossierTemplateId);
+        Long rulesVersion = rulesVersionPerDossierTemplateId.get(dossierTemplateId);
        if (rulesVersion == null) {
            rulesVersion = -1L;
        }

-        if (version > rulesVersion.longValue()) {
-            rulesVersionPerRuleSetId.put(ruleSetId, version);
-            return createOrUpdateKieContainer(ruleSetId);
+        if (version > rulesVersion) {
+            rulesVersionPerDossierTemplateId.put(dossierTemplateId, version);
+            return createOrUpdateKieContainer(dossierTemplateId);
        }
-        return getKieContainer(ruleSetId);
+        return getKieContainer(dossierTemplateId);

    }


-    private KieContainer createOrUpdateKieContainer(String ruleSetId) {
+    private KieContainer createOrUpdateKieContainer(String dossierTemplateId) {

        try {

-            RulesResponse rules = rulesClient.getRules(ruleSetId);
+            RulesResponse rules = rulesClient.getRules(dossierTemplateId);
            if (rules == null || StringUtils.isEmpty(rules.getRules())) {
                throw new RuntimeException("Rules cannot be empty.");
            }

            KieServices kieServices = KieServices.Factory.get();
-            KieModule kieModule = getKieModule(ruleSetId, rules.getRules(), kieServices);
+            KieModule kieModule = getKieModule(dossierTemplateId, rules.getRules(), kieServices);

-            var container = kieContainers.get(ruleSetId);
+            var container = kieContainers.get(dossierTemplateId);
            if (container != null) {
                container.updateToVersion(kieModule.getReleaseId());
                return container;
            }

            container = kieServices.newKieContainer(kieModule.getReleaseId());
-            kieContainers.put(ruleSetId, container);
+            kieContainers.put(dossierTemplateId, container);
            return container;
        } catch (Exception e) {
            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
@@ -100,11 +100,11 @@ public class DroolsExecutionService {
    }


-    private KieModule getKieModule(String ruleSetId, String rules, KieServices kieServices) {
+    private KieModule getKieModule(String dossierTemplateId, String rules, KieServices kieServices) {

        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
        InputStream input = new ByteArrayInputStream(rules.getBytes(StandardCharsets.UTF_8));
-        kieFileSystem.write("src/main/resources/drools/rules" + ruleSetId + ".drl", kieServices.getResources()
+        kieFileSystem.write("src/main/resources/drools/rules" + dossierTemplateId + ".drl", kieServices.getResources()
                .newInputStreamResource(input));
        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
        kieBuilder.buildAll();
@@ -122,13 +122,13 @@ public class DroolsExecutionService {
    }


-    public long getRulesVersion(String ruleSetId) {
+    public long getRulesVersion(String dossierTemplateId) {

-        Long rulesVersion = rulesVersionPerRuleSetId.get(ruleSetId);
+        Long rulesVersion = rulesVersionPerDossierTemplateId.get(dossierTemplateId);
        if (rulesVersion == null) {
            return -1;
        }
-        return rulesVersion.longValue();
+        return rulesVersion;
    }

 }
@@ -1,14 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.server.classification.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import lombok.RequiredArgsConstructor;
@@ -33,32 +30,37 @@ public class EntityRedactionService {
    private final SurroundingWordsService surroundingWordsService;


-    public void processDocument(Document classifiedDoc, String ruleSetId, ManualRedactions manualRedactions, String dossierId) {
+    public void processDocument(Document classifiedDoc, String dossierTemplateId, ManualRedactions manualRedactions,
+                                String dossierId, List<FileAttribute> fileAttributes) {

-        dictionaryService.updateDictionary(ruleSetId, dossierId);
-        KieContainer container = droolsExecutionService.updateRules(ruleSetId);
-        long rulesVersion = droolsExecutionService.getRulesVersion(ruleSetId);
+        dictionaryService.updateDictionary(dossierTemplateId, dossierId);
+        KieContainer container = droolsExecutionService.updateRules(dossierTemplateId);
+        long rulesVersion = droolsExecutionService.getRulesVersion(dossierTemplateId);

-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(ruleSetId, dossierId);
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(dossierTemplateId, dossierId);

-        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null));
+        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null, fileAttributes));

        if (dictionary.hasLocalEntries()) {

-            Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
-            documentEntities.stream().forEach(entity -> {
-                if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
-                    hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
-                            .add(entity);
-                }
-            });
-
-            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber);
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = getHintsPerSection(documentEntities, dictionary);
+            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber, fileAttributes);
            EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary);
            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
        }

-        for (Entity entity : documentEntities) {
+        classifiedDoc.setEntities(convertToEnititesPerPage(documentEntities));
+
+        dictionaryService.updateExternalDictionary(dictionary, dossierTemplateId);
+
+        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
+        classifiedDoc.setRulesVersion(rulesVersion);
+    }
+
+
+    public Map<Integer, List<Entity>> convertToEnititesPerPage(Set<Entity> entities){
+        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
+        for (Entity entity : entities) {
            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
@@ -66,7 +68,7 @@ public class EntityRedactionService {
            }

            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                classifiedDoc.getEntities()
+                entitiesPerPage
                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
@@ -74,17 +76,25 @@ public class EntityRedactionService {
                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
            }
        }
-
-        dictionaryService.updateExternalDictionary(dictionary, ruleSetId);
-
-        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
-        classifiedDoc.setRulesVersion(rulesVersion);
+        return entitiesPerPage;
    }


+    public Map<Integer, Set<Entity>> getHintsPerSection(Set<Entity> entities, Dictionary dictionary){
+        Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
+        entities.stream().forEach(entity -> {
+            if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
+                hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
+                        .add(entity);
+            }
+        });
+        return hintsPerSectionNumber;
+    }
+
    private Set<Entity> findEntities(Document classifiedDoc, KieContainer kieContainer,
                                     ManualRedactions manualRedactions, Dictionary dictionary, boolean local,
-                                     Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                     List<FileAttribute> fileAttributes) {

        Set<Entity> documentEntities = new HashSet<>();

@@ -95,76 +105,80 @@ public class EntityRedactionService {
            List<Table> tables = paragraph.getTables();
            for (Table table : tables) {
                if (table.getColCount() == 2) {
-                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes, manualRedactions));
                } else {
-                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes, manualRedactions));
                }
                sectionNumber.incrementAndGet();
            }
            sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, paragraph
-                    .getImages()));
+                    .getImages(), fileAttributes));
            sectionNumber.incrementAndGet();
        }

        for (Header header : classifiedDoc.getHeaders()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
            sectionNumber.incrementAndGet();
        }

        for (Footer footer : classifiedDoc.getFooters()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
            sectionNumber.incrementAndGet();
        }

        for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
            sectionSearchableTextPairs.add(processText(classifiedDoc, unclassifiedText.getSearchableText(), unclassifiedText
-                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
            sectionNumber.incrementAndGet();
        }

        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
-            documentEntities.addAll(analysedRowSection.getEntities());
+            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            documentEntities.addAll(analysedSection.getEntities());

-            for (Image image : analysedRowSection.getImages()) {
+            for (Image image : analysedSection.getImages()) {
                classifiedDoc.getImages().computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
            }

-            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
-                if (dictionary.isRecommendation(key)) {
-                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-                        if (!dictionary.containsValue(key, value)) {
-                            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                        }
-                    });
-                } else {
-                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-
-                        if (dictionary.getLocalAccessMap().get(key) == null) {
-                            log.warn("Dictionary {} is null", key);
-                        }
-
-                        if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
-                            log.warn("Dictionary {} localEntries is null", key);
-                        }
-
-                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                    });
-                }
-            });
-
+            addLocalValuesToDictionary(analysedSection, dictionary);
        });

        return documentEntities;
    }


+    public void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary){
+        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+            if (dictionary.isRecommendation(key)) {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                    if (!dictionary.containsValue(key, value)) {
+                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                    }
+                });
+            } else {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+
+                    if (dictionary.getLocalAccessMap().get(key) == null) {
+                        log.warn("Dictionary {} is null", key);
+                    }
+
+                    if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
+                        log.warn("Dictionary {} localEntries is null", key);
+                    }
+
+                    dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                });
+            }
+        });
+    }
+
+
    private List<SectionSearchableTextPair> processTablePerRow(Document classifiedDoc, Table table,
-                                                               ManualRedactions manualRedactions,
                                                               AtomicInteger sectionNumber, Dictionary dictionary,
                                                               boolean local,
-                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                                               List<FileAttribute> fileAttributes, ManualRedactions manualRedactions) {

        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();

@@ -189,7 +203,6 @@ public class EntityRedactionService {
                sectionText.getSectionAreas().add(sectionArea);
                sectionText.getTextBlocks().addAll(cell.getTextBlocks());

-                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
                int cellStart = start;

                if (!cell.isHeaderCell()) {
@@ -216,6 +229,31 @@ public class EntityRedactionService {
            Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
            surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);

+            if (!local && manualRedactions != null) {
+
+
+                var approvedForceRedactions = manualRedactions.getForceRedacts().stream()
+                        .filter(fr -> fr.getStatus() == Status.APPROVED)
+                        .filter(fr -> fr.getRequestDate() != null)
+                        .collect(Collectors.toList());
+                // only approved id removals, that haven't been forced back afterwards
+                var idsToRemove = manualRedactions.getIdsToRemove().stream()
+                        .filter(idr -> idr.getStatus() == Status.APPROVED)
+                        .filter(idr -> idr.getRequestDate() != null)
+                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
+                        .map(IdRemoval::getId).collect(Collectors.toSet());
+
+                log.info("Removed Ids: {}", idsToRemove);
+
+                rowEntities.forEach(entity ->
+                        entity.getPositionSequences().forEach(ps -> {
+                            if (idsToRemove.contains(ps.getId())) {
+                                entity.setIgnored(true);
+                            }
+                        }));
+
+            }
+
            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                    .isLocal(local)
                    .dictionaryTypes(dictionary.getTypes())
@@ -229,6 +267,7 @@ public class EntityRedactionService {
                    .tabularData(tabularData)
                    .searchableText(searchableRow)
                    .dictionary(dictionary)
+                    .fileAttributes(fileAttributes)
                    .build(), searchableRow));

            if (!local) {
@@ -249,10 +288,10 @@ public class EntityRedactionService {


    private List<SectionSearchableTextPair> processTableAsOneText(Document classifiedDoc, Table table,
-                                                                  ManualRedactions manualRedactions,
                                                                  AtomicInteger sectionNumber, Dictionary dictionary,
                                                                  boolean local,
-                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                                                  List<FileAttribute> fileAttributes, ManualRedactions manualRedactions) {

        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        SearchableText entireTableText = new SearchableText();
@@ -277,13 +316,37 @@ public class EntityRedactionService {
                for (TextBlock textBlock : cell.getTextBlocks()) {
                    entireTableText.addAll(textBlock.getSequences());
                }
-                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
            }
        }

        Set<Entity> rowEntities = findEntities(entireTableText, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
        surroundingWordsService.addSurroundingText(rowEntities, entireTableText, dictionary);

+        if (!local && manualRedactions != null) {
+
+
+            var approvedForceRedactions = manualRedactions.getForceRedacts().stream()
+                    .filter(fr -> fr.getStatus() == Status.APPROVED)
+                    .filter(fr -> fr.getRequestDate() != null)
+                    .collect(Collectors.toList());
+            // only approved id removals, that haven't been forced back afterwards
+            var idsToRemove = manualRedactions.getIdsToRemove().stream()
+                    .filter(idr -> idr.getStatus() == Status.APPROVED)
+                    .filter(idr -> idr.getRequestDate() != null)
+                    .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
+                    .map(IdRemoval::getId).collect(Collectors.toSet());
+
+            log.info("Removed Ids: {}", idsToRemove);
+
+            rowEntities.forEach(entity ->
+                    entity.getPositionSequences().forEach(ps -> {
+                        if (idsToRemove.contains(ps.getId())) {
+                            entity.setIgnored(true);
+                        }
+                    }));
+
+        }
+
        sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                .isLocal(local)
                .dictionaryTypes(dictionary.getTypes())
@@ -296,6 +359,7 @@ public class EntityRedactionService {
                .sectionNumber(sectionNumber.intValue())
                .searchableText(entireTableText)
                .dictionary(dictionary)
+                .fileAttributes(fileAttributes)
                .build(), entireTableText));

        if (!local) {
@@ -315,7 +379,7 @@ public class EntityRedactionService {
                                                  ManualRedactions manualRedactions, AtomicInteger sectionNumber,
                                                  Dictionary dictionary, boolean local,
                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber,
-                                                  List<PdfImage> images) {
+                                                  List<PdfImage> images, List<FileAttribute> fileAttributes) {

        if (!local) {
            SectionText sectionText = new SectionText();
@@ -330,16 +394,40 @@ public class EntityRedactionService {
            sectionText.setSectionNumber(sectionNumber.intValue());
            sectionText.setTable(false);
            sectionText.setImages(images.stream()
-                    .map(image -> convert(image, sectionNumber.intValue(), headline))
+                    .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
                    .collect(Collectors.toSet()));
            sectionText.setTextBlocks(paragraphTextBlocks);
            classifiedDoc.getSectionText().add(sectionText);
        }

-        addSectionToManualRedactions(paragraphTextBlocks, manualRedactions, headline, sectionNumber.intValue());
        Set<Entity> entities = findEntities(searchableText, headline, sectionNumber.intValue(), dictionary, local);
        surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);

+        if (!local && manualRedactions != null) {
+
+
+            var approvedForceRedactions = manualRedactions.getForceRedacts().stream()
+                    .filter(fr -> fr.getStatus() == Status.APPROVED)
+                    .filter(fr -> fr.getRequestDate() != null)
+                    .collect(Collectors.toList());
+            // only approved id removals, that haven't been forced back afterwards
+            var idsToRemove = manualRedactions.getIdsToRemove().stream()
+                    .filter(idr -> idr.getStatus() == Status.APPROVED)
+                    .filter(idr -> idr.getRequestDate() != null)
+                    .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
+                    .map(IdRemoval::getId).collect(Collectors.toSet());
+
+            log.info("Removed Ids: {}", idsToRemove);
+
+            entities.forEach(entity ->
+                    entity.getPositionSequences().forEach(ps -> {
+                        if (idsToRemove.contains(ps.getId())) {
+                            entity.setIgnored(true);
+                        }
+                    }));
+
+        }
+
        return new SectionSearchableTextPair(Section.builder()
                .isLocal(local)
                .dictionaryTypes(dictionary.getTypes())
@@ -353,8 +441,9 @@ public class EntityRedactionService {
                .searchableText(searchableText)
                .dictionary(dictionary)
                .images(images.stream()
-                        .map(image -> convert(image, sectionNumber.intValue(), headline))
+                        .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
                        .collect(Collectors.toSet()))
+                .fileAttributes(fileAttributes)
                .build(), searchableText);
    }

@@ -371,9 +460,11 @@ public class EntityRedactionService {
        String lowercaseInputString = searchableString.toLowerCase();
        for (DictionaryModel model : dictionary.getDictionaryModels()) {
            if (model.isCaseInsensitive()) {
-                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
+                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model
+                        .isDossierDictionary()));
            } else {
-                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
+                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model
+                        .isDossierDictionary()));
            }
        }

@@ -381,29 +472,9 @@ public class EntityRedactionService {
    }


-    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
-                                              String section, int sectionNumber) {
+    private Image convertAndRecategorize(PdfImage pdfImage, int sectionNumber, String headline, ManualRedactions manualRedactions) {

-        if (manualRedactions == null || manualRedactions.getEntriesToAdd().isEmpty()) {
-            return;
-        }
-
-        for (TextBlock textBlock : textBlocks) {
-            for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {
-                for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-                    if (textBlock.contains(rectangle)) {
-                        manualRedactionEntry.setSection(section);
-                        manualRedactionEntry.setSectionNumber(sectionNumber);
-                    }
-                }
-            }
-        }
-    }
-
-
-    private Image convert(PdfImage pdfImage, int sectionNumber, String headline) {
-
-        return Image.builder()
+        Image image = Image.builder()
                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
                        .name()
                        .toLowerCase(Locale.ROOT))
@@ -411,7 +482,20 @@ public class EntityRedactionService {
                .sectionNumber(sectionNumber)
                .section(headline)
                .page(pdfImage.getPage())
+                .hasTransparency(pdfImage.isHasTransparency())
                .build();
+
+        String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
+        if (manualRedactions != null && manualRedactions.getImageRecategorizations() != null) {
+            for (ManualImageRecategorization imageRecategorization : manualRedactions.getImageRecategorizations()) {
+                if (imageRecategorization.getStatus().equals(Status.APPROVED) && imageRecategorization.getId()
+                        .equals(imageId)) {
+                    image.setType(imageRecategorization.getType());
+                }
+            }
+        }
+
+        return image;
    }

 }
@@ -5,6 +5,7 @@ import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClien
 import com.iqser.red.service.redaction.v1.server.client.ImageClassificationResponse;
 import com.iqser.red.service.redaction.v1.server.client.MockMultipartFile;
 import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +27,7 @@ public class ImageClassificationService {

        page.getImages().forEach(image -> {

-            if (settings.isEnableImageClassification()) {
+            if (settings.isEnableImageClassification() && !isEntirePageImage(image, page)) {

                long start = System.currentTimeMillis();
                try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
@@ -38,7 +39,6 @@ public class ImageClassificationService {
                    log.error("Could not classify image", e);
                    image.setImageType(ImageType.OTHER);
                }
-
                log.info("Image classification took: " + (System.currentTimeMillis() - start));
            } else {
                image.setImageType(ImageType.OTHER);
@@ -59,4 +59,13 @@ public class ImageClassificationService {

    }

+    private boolean isEntirePageImage(PdfImage image, Page page){
+        double imageArea = image.getPosition().getHeight() * image.getPosition().getWidth();
+        if(imageArea / page.getCropBoxArea() >= settings.getMaxImageCropboxRatio()){
+            log.info("Skipping image classification because images is almost as large as the entire page");
+            return true;
+        }
+        return false;
+    }
+
 }
@@ -10,13 +10,13 @@ import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-
 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,6 +40,8 @@ public class ReanalyzeService {
    private final RedactionChangeLogService redactionChangeLogService;
    private final AnalyzeResponseService analyzeResponseService;
    private final LegalBasisClient legalBasisClient;
+    private final RedactionServiceSettings redactionServiceSettings;
+

    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {

@@ -50,7 +52,7 @@ public class ReanalyzeService {

        try {
            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest
-                    .getProjectId(), analyzeRequest.getFileId(), FileType.ORIGIN));
+                    .getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));
            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
            pageCount = classifiedDoc.getPages().size();
        } catch (Exception e) {
@@ -58,35 +60,42 @@ public class ReanalyzeService {
        }
        log.info("Document structure analysis successful, starting redaction analysis...");

-        entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getRuleSetId(), analyzeRequest.getManualRedactions(), analyzeRequest
-                .getProjectId());
-        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getManualRedactions(), analyzeRequest
-                .getRuleSetId());
+        entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getDossierTemplateId(), analyzeRequest.getManualRedactions(), analyzeRequest
+                .getDossierId(), analyzeRequest.getFileAttributes());
+        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getDossierTemplateId());

        log.info("Redaction analysis successful...");

-        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getRuleSetId());
-        var redactionLog = new RedactionLog(classifiedDoc.getRedactionLogEntities(),legalBasis,
-                analyzeRequest.getRuleSetId(),
-                classifiedDoc.getDictionaryVersion().getRulesetVersion(),
-                classifiedDoc.getRulesVersion(),
-                classifiedDoc.getDictionaryVersion().getDossierVersion(),
-                legalBasisClient.getVersion(analyzeRequest.getRuleSetId()));
+        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), classifiedDoc.getRedactionLogEntities(), legalBasis, classifiedDoc.getDictionaryVersion()
+                .getDossierTemplateVersion(), classifiedDoc.getDictionaryVersion()
+                .getDossierVersion(), classifiedDoc.getRulesVersion(), legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));

-        log.info("Analyzed with rules {} and dictionary {} for ruleSet: {}", classifiedDoc.getRulesVersion(), classifiedDoc
-                .getDictionaryVersion(), analyzeRequest.getRuleSetId());
+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+
+        log.info("Analyzed with rules {} and dictionary {} for dossierTemplate: {}", classifiedDoc.getRulesVersion(), classifiedDoc
+                .getDictionaryVersion(), analyzeRequest.getDossierTemplateId());

        // first create changelog - this only happens when we migrate files analyzed via the old process and we don't want to loose changeLog data
-        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), redactionLog);
+        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
        // store redactionLog
-        redactionStorageService.storeObject(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
-        redactionStorageService.storeObject(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), FileType.TEXT, new Text(pageCount, classifiedDoc
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, new Text(pageCount, classifiedDoc
                .getSectionText()));
-        redactionStorageService.storeObject(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
+
+        // enhance section grid with headline data
+        classifiedDoc.getSectionText().forEach(sectionText -> {
+            classifiedDoc
+                    .getSectionGrid().getSections().add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(),
+                            sectionText.getHeadline(),
+                            sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()),
+                            sectionText.getSectionAreas()));
+        });
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
                .getSectionGrid());

        long duration = System.currentTimeMillis() - startTime;
-        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), duration, pageCount, redactionLog, changeLog);
+        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), duration, pageCount, redactionLog, changeLog);
    }


@@ -95,31 +104,77 @@ public class ReanalyzeService {

        long startTime = System.currentTimeMillis();

-        var redactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getProjectId(), analyzeRequest.getFileId());
-        var text = redactionStorageService.getText(analyzeRequest.getProjectId(), analyzeRequest.getFileId());
+        var redactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());

        // not yet ready for reanalysis
        if (redactionLog == null || text == null || text.getNumberOfPages() == 0) {
            return analyze(analyzeRequest);
        }

-        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getRuleSetId(), new DictionaryVersion(redactionLog
-                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getProjectId());
+        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
+                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());

-        Set<String> manualForceAndRemoveIds = getForceAndRemoveIds(analyzeRequest.getManualRedactions());
-        Map<String, List<Comment>> comments = null;
-        Set<ManualRedactionEntry> manualAdds = null;
+        Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse().isEmpty() ? analyzeRequest.getSectionsToReanalyse() :
+                findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);

-        if (analyzeRequest.getManualRedactions() != null) {
-            // TODO comments will be removed from redactionLog, so we ignore this first.
-            comments = analyzeRequest.getManualRedactions().getComments();
-            manualAdds = analyzeRequest.getManualRedactions().getEntriesToAdd();
+        if (sectionsToReanalyse.isEmpty()) {
+            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
        }

+        List<SectionText> reanalysisSections = text.getSectionTexts()
+                .stream()
+                .filter(sectionText -> sectionsToReanalyse.contains(sectionText.getSectionNumber()))
+                .collect(Collectors.toList());
+
+        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
+
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
+                .getDossierId());
+
+        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
+        Set<Entity> entities = findEntities(reanalysisSections, dictionary, kieContainer, analyzeRequest, false, null, imagesPerPage);
+
+        if (dictionary.hasLocalEntries()) {
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = entityRedactionService.getHintsPerSection(entities, dictionary);
+            Set<Entity> foundByLocal = findEntities(reanalysisSections, dictionary, kieContainer, analyzeRequest, true, hintsPerSectionNumber, imagesPerPage);
+            EntitySearchUtils.addEntitiesWithHigherRank(entities, foundByLocal, dictionary);
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+        }
+
+        Map<Integer, List<Entity>> entitiesPerPage = entityRedactionService.convertToEnititesPerPage(entities);
+
+        List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
+        for (int page = 1; page <= text.getNumberOfPages(); page++) {
+            if (entitiesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, page, analyzeRequest
+                        .getDossierTemplateId()));
+            }
+
+            if (imagesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, page, analyzeRequest
+                        .getDossierTemplateId()));
+            }
+
+        }
+
+        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
+        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
+        AnalyzeResult analyzeResult = finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+        analyzeResult.setWasReanalyzed(true);
+        return analyzeResult;
+    }
+
+
+    private Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog,
+                                                 Text text, AnalyzeRequest analyzeRequest) {
+
+        Set<String> relevantManuallyModifiedAnnotationIds = getRelevantManuallyModifiedAnnotationIds(analyzeRequest.getManualRedactions());
+
        Set<Integer> sectionsToReanalyse = new HashSet<>();
        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-            if (entry.isManual() || manualForceAndRemoveIds.contains(entry.getId())) {
+            if (entry.isManual() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
                sectionsToReanalyse.add(entry.getSectionNumber());
            }
            if (entry.isImage() || entry.getType().equals("image")) {
@@ -133,57 +188,79 @@ public class ReanalyzeService {
                sectionsToReanalyse.add(sectionText.getSectionNumber());
            }

-            if (manualAdds != null) {
-                for (SectionArea sectionArea : sectionText.getSectionAreas()) {
-                    for (ManualRedactionEntry manualAdd : manualAdds) {
-                        for (Rectangle manualPosition : manualAdd.getPositions()) {
-                            if (sectionArea.contains(manualPosition)) {
-                                manualAdd.setSection(sectionText.getHeadline());
-                                manualAdd.setSectionNumber(sectionText.getSectionNumber());
-                            }
-                        }
-                    }
-                }
-            }
        }

        log.info("Should reanalyze {} sections for request: {}", sectionsToReanalyse.size(), analyzeRequest);

-        if (sectionsToReanalyse.isEmpty() && (manualAdds == null || manualAdds.isEmpty())) {
-            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-        }
+        return sectionsToReanalyse;
+    }

-        List<SectionText> reanalysisSections = new ArrayList<>();

-        for (SectionText sectionText : text.getSectionTexts()) {
-
-            if (sectionsToReanalyse.contains(sectionText.getSectionNumber())) {
-                reanalysisSections.add(sectionText);
-            }
-        }
-
-        //--
-
-        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getRuleSetId());
-
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getRuleSetId(), analyzeRequest.getProjectId());
+    private Set<Entity> findEntities(List<SectionText> reanalysisSections, Dictionary dictionary,
+                                     KieContainer kieContainer, AnalyzeRequest analyzeRequest, boolean local,
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                     Map<Integer, Set<Image>> imagesPerPage) {

        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        for (SectionText reanalysisSection : reanalysisSections) {

            Set<Entity> entities = entityRedactionService.findEntities(reanalysisSection.getSearchableText(), reanalysisSection
-                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, false);
-            if (reanalysisSection.getCellStarts() != null) {
+                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, local);
+            if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
                        .getCellStarts());
            } else {
                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
            }

+            if (!local && analyzeRequest.getManualRedactions() != null) {
+
+
+                var approvedForceRedactions = analyzeRequest.getManualRedactions().getForceRedacts().stream()
+                        .filter(fr -> fr.getStatus() == Status.APPROVED)
+                        .filter(fr -> fr.getRequestDate() != null)
+                        .collect(Collectors.toList());
+                // only approved id removals, that haven't been forced back afterwards
+                var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream()
+                        .filter(idr -> idr.getStatus() == Status.APPROVED)
+                        .filter(idr -> idr.getRequestDate() != null)
+                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
+                        .map(IdRemoval::getId).collect(Collectors.toSet());
+
+                log.info("Removed Ids: {}", idsToRemove);
+
+                if (reanalysisSection.getImages() != null && !reanalysisSection.getImages().isEmpty() && analyzeRequest.getManualRedactions().getImageRecategorizations() != null) {
+                    for (Image image : reanalysisSection.getImages()) {
+                        String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
+                        for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
+                                .getImageRecategorizations()) {
+                            if (imageRecategorization.getStatus().equals(Status.APPROVED) && imageRecategorization.getId()
+                                    .equals(imageId)) {
+                                image.setType(imageRecategorization.getType());
+                            }
+                        }
+                        if (idsToRemove.contains(imageId)) {
+                            image.setIgnored(true);
+                        }
+                    }
+                }
+
+                entities.forEach(entity ->
+                        entity.getPositionSequences().forEach(ps -> {
+                            if (idsToRemove.contains(ps.getId())) {
+                                entity.setIgnored(true);
+                            }
+                        }));
+
+            }
+
            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                    .isLocal(false)
                    .dictionaryTypes(dictionary.getTypes())
-                    .entities(entities)
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
+                            .concat(entities.stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
+                                    .stream())
+                            .collect(Collectors.toSet()) : entities)
                    .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
                    .searchText(reanalysisSection.getSearchableText().toString())
                    .headline(reanalysisSection.getHeadline())
@@ -192,60 +269,24 @@ public class ReanalyzeService {
                    .searchableText(reanalysisSection.getSearchableText())
                    .dictionary(dictionary)
                    .images(reanalysisSection.getImages())
+                    .fileAttributes(analyzeRequest.getFileAttributes())
                    .build(), reanalysisSection.getSearchableText()));
        }

        Set<Entity> entities = new HashSet<>();
-        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
-            entities.addAll(analysedRowSection.getEntities());
+            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            entities.addAll(analysedSection.getEntities());
            EntitySearchUtils.removeEntitiesContainedInLarger(entities);

-            for (Image image : analysedRowSection.getImages()) {
+            for (Image image : analysedSection.getImages()) {
                imagesPerPage.computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
            }

+            entityRedactionService.addLocalValuesToDictionary(analysedSection, dictionary);
        });

-        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
-        for (Entity entity : entities) {
-            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
-            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
-                        .add(entityPositionSequence);
-            }
-
-            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                entitiesPerPage.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
-                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
-            }
-        }
-
-        List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
-        for (int page = 1; page <= text.getNumberOfPages(); page++) {
-            if (entitiesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
-                        .getRuleSetId()));
-            }
-
-            if (imagesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
-                        .getRuleSetId()));
-            }
-
-            newRedactionLogEntries.addAll(redactionLogCreatorService.addManualAddEntries(manualAdds, comments, page, analyzeRequest
-                    .getRuleSetId()));
-        }
-
-        redactionLog.getRedactionLogEntry()
-                .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
-        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-
+        return entities;
    }


@@ -253,28 +294,34 @@ public class ReanalyzeService {
                                           RedactionLog redactionLog, Text text,
                                           DictionaryIncrement dictionaryIncrement) {

-        redactionLog.setDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getRulesetVersion());
+        redactionLog.setDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierTemplateVersion());
        redactionLog.setDossierDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierVersion());

-        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), redactionLog);
-        redactionStorageService.storeObject(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+
+        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);

        long duration = System.currentTimeMillis() - startTime;

-        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), duration, text
+        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), duration, text
                .getNumberOfPages(), redactionLog, changeLog);
    }


-    private Set<String> getForceAndRemoveIds(ManualRedactions manualRedactions) {
+    private Set<String> getRelevantManuallyModifiedAnnotationIds(ManualRedactions manualRedactions) {

        if (manualRedactions == null) {
            return new HashSet<>();
        }

-        return Stream.concat(manualRedactions.getIdsToRemove()
-                .stream()
-                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))
+        return Stream.concat(manualRedactions.getManualLegalBasisChanges()
+                        .stream()
+                        .map(ManualLegalBasisChange::getId), Stream.concat(manualRedactions.getImageRecategorizations()
+                        .stream()
+                        .map(ManualImageRecategorization::getId), Stream.concat(manualRedactions.getIdsToRemove()
+                        .stream()
+                        .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))))
                .collect(Collectors.toSet());
    }

@@ -290,7 +337,20 @@ public class ReanalyzeService {
                .sectionNumber(entry.getSectionNumber())
                .section(entry.getSection())
                .page(position.getPage())
+                .hasTransparency(entry.isImageHasTransparency())
                .build();
    }

+
+    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {
+
+        if (excludedPages != null && !excludedPages.isEmpty()) {
+            redactionLog.getRedactionLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> {
+                if (excludedPages.contains(pos.getPage())) {
+                    entry.setExcluded(true);
+                }
+            }));
+        }
+    }
+
 }
@@ -22,12 +22,12 @@ public class RedactionChangeLogService {

    private final RedactionStorageService redactionStorageService;

-    public RedactionChangeLog createAndStoreChangeLog(String projectId, String fileId, RedactionLog currentRedactionLog) {
+    public RedactionChangeLog createAndStoreChangeLog(String dossierId, String fileId, RedactionLog currentRedactionLog) {

        try {
-            RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(projectId, fileId);
+            RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(dossierId, fileId);
            var changeLog = createChangeLog(currentRedactionLog, previousRedactionLog);
-            redactionStorageService.storeObject(projectId, fileId, FileType.REDACTION_CHANGELOG, changeLog);
+            redactionStorageService.storeObject(dossierId, fileId, FileType.REDACTION_CHANGELOG, changeLog);
            return changeLog;
        } catch (Exception e) {
            log.debug("Previous redaction log not available");
@@ -57,8 +57,11 @@ public class RedactionChangeLogService {
                .map(entry -> convert(entry, ChangeType.REMOVED))
                .collect(Collectors.toList()));

-        return new RedactionChangeLog(changeLogEntries, currentRedactionLog.getDictionaryVersion(), currentRedactionLog.getRulesVersion(), currentRedactionLog
-                .getRuleSetId());
+        return new RedactionChangeLog(changeLogEntries,
+                currentRedactionLog.getDictionaryVersion(),
+                currentRedactionLog.getDossierDictionaryVersion(),
+                currentRedactionLog.getRulesVersion(),
+                currentRedactionLog.getLegalBasisVersion());
    }


@@ -87,6 +90,7 @@ public class RedactionChangeLogService {
                .comments(entry.getComments())
                .changeType(changeType)
                .isDossierDictionaryEntry(entry.isDossierDictionaryEntry())
+                .excluded(entry.isExcluded())
                .build();
    }

@@ -1,6 +1,20 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.redaction.v1.model.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.CellRectangle;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -13,16 +27,8 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;

-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
@@ -31,10 +37,7 @@ public class RedactionLogCreatorService {
    private final DictionaryService dictionaryService;


-    public void createRedactionLog(Document classifiedDoc, int numberOfPages, ManualRedactions manualRedactions,
-                                   String ruleSetId) {
-
-        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);
+    public void createRedactionLog(Document classifiedDoc, int numberOfPages, String dossierTemplateId) {

        for (int page = 1; page <= numberOfPages; page++) {

@@ -42,24 +45,19 @@ public class RedactionLogCreatorService {

            if (classifiedDoc.getEntities().get(page) != null) {
                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addEntries(classifiedDoc.getEntities(), manualRedactions, page, ruleSetId));
-            }
-
-            if (manualRedactionPages.contains(page)) {
-                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, ruleSetId));
+                        .addAll(addEntries(classifiedDoc.getEntities(), page, dossierTemplateId));
            }

            if (classifiedDoc.getImages().get(page) != null && !classifiedDoc.getImages().get(page).isEmpty()) {
                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addImageEntries(classifiedDoc.getImages(), manualRedactions, page, ruleSetId));
+                        .addAll(addImageEntries(classifiedDoc.getImages(), page, dossierTemplateId));
            }
        }
    }


-    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, ManualRedactions manualRedactions,
-                                                   int pageNumber, String ruleSetId) {
+    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, int pageNumber,
+                                                   String dossierTemplateId) {

        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();

@@ -69,14 +67,14 @@ public class RedactionLogCreatorService {

            RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
                    .id(id)
-                    .color(getColorForImage(image, ruleSetId, false))
+                    .color(getColor(image.getType(), dossierTemplateId, image.isRedaction()))
                    .isImage(true)
                    .type(image.getType())
                    .redacted(image.isRedaction())
                    .reason(image.getRedactionReason())
                    .legalBasis(image.getLegalBasis())
                    .matchedRule(image.getMatchedRule())
-                    .isHint(dictionaryService.isHint(image.getType(), ruleSetId))
+                    .isHint(dictionaryService.isHint(image.getType(), dossierTemplateId))
                    .manual(false)
                    .isDictionaryEntry(false)
                    .isRecommendation(false)
@@ -84,63 +82,12 @@ public class RedactionLogCreatorService {
                            .getX(), (float) image.getPosition().getY()), (float) image.getPosition()
                            .getWidth(), (float) image.getPosition().getHeight(), pageNumber)))
                    .sectionNumber(image.getSectionNumber())
-                    .section(image.getSection())
+                    //.section(image.getSection())
+                    // RED-2622
+                    .section("Image:" + image.getType())
+                    .imageHasTransparency(image.isHasTransparency())
                    .build();

-            if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-                for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                    if (manualRemoval.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(false);
-                            redactionLogEntry.setRedacted(false);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            manualOverrideReason = image.getRedactionReason() + ", removed by manual override";
-                            redactionLogEntry.setColor(getColorForImage(image, ruleSetId, false));
-                        } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to remove";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, ruleSetId, true));
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    }
-                }
-            }
-
-            if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-                for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                    if (manualForceRedact.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(true);
-                            redactionLogEntry.setRedacted(true);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            redactionLogEntry.setColor(getColorForImage(image, ruleSetId, false));
-                            manualOverrideReason = image.getRedactionReason() + ", forced by manual override";
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to force redact";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, ruleSetId, true));
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                    }
-                }
-            }
-
            redactionLogEntities.add(redactionLogEntry);
        }

@@ -148,25 +95,7 @@ public class RedactionLogCreatorService {
    }


-    private Set<Integer> getManualRedactionPages(ManualRedactions manualRedactions) {
-
-        Set<Integer> manualRedactionPages = new HashSet<>();
-
-        if (manualRedactions == null) {
-            return manualRedactionPages;
-        }
-
-        manualRedactions.getEntriesToAdd().forEach(entry -> {
-            entry.getPositions().forEach(pos -> {
-                manualRedactionPages.add(pos.getPage());
-            });
-        });
-        return manualRedactionPages;
-    }
-
-
-    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, ManualRedactions manualRedactions,
-                                              int page, String ruleSetId) {
+    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, int page, String dossierTemplateId) {

        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();

@@ -176,11 +105,9 @@ public class RedactionLogCreatorService {
        entityLoop:
        for (Entity entity : entities.get(page)) {

-            List<Comment> comments = null;
-
            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {

-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity, ruleSetId);
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity, dossierTemplateId);
                if (processedIds.contains(entityPositionSequence.getId())) {

                    // TODO refactor this outer loop jump as soon as we have the time.
@@ -189,60 +116,7 @@ public class RedactionLogCreatorService {
                    processedIds.add(entityPositionSequence.getId());
                }

-                if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-                    for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                        if (manualRemoval.getId().equals(entityPositionSequence.getId())) {
-                            comments = manualRedactions.getComments().get(manualRemoval.getId());
-                            String manualOverrideReason = null;
-                            if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                                entity.setRedaction(false);
-                                redactionLogEntry.setRedacted(false);
-                                redactionLogEntry.setStatus(Status.APPROVED);
-                                manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
-                                redactionLogEntry.setColor(getColor(entity, ruleSetId, false));
-                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
-                                redactionLogEntry.setStatus(Status.REQUESTED);
-                                redactionLogEntry.setColor(getColor(entity, ruleSetId, true));
-                            } else {
-                                redactionLogEntry.setStatus(Status.DECLINED);
-                            }
-
-                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
-                            redactionLogEntry.setReason(manualOverrideReason);
-                            redactionLogEntry.setManual(true);
-                            redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                        }
-                    }
-                }
-
-                if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-                    for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                        if (manualForceRedact.getId().equals(entityPositionSequence.getId())) {
-                            String manualOverrideReason = null;
-                            if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                                entity.setRedaction(true);
-                                redactionLogEntry.setRedacted(true);
-                                redactionLogEntry.setStatus(Status.APPROVED);
-                                redactionLogEntry.setColor(getColor(entity, ruleSetId, false));
-                                manualOverrideReason = entity.getRedactionReason() + ", forced by manual override";
-                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                            } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                                manualOverrideReason = entity.getRedactionReason() + ", requested to force redact";
-                                redactionLogEntry.setStatus(Status.REQUESTED);
-                                redactionLogEntry.setColor(getColor(entity, ruleSetId, true));
-                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                            } else {
-                                redactionLogEntry.setStatus(Status.DECLINED);
-                            }
-
-                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
-                            redactionLogEntry.setReason(manualOverrideReason);
-                            redactionLogEntry.setManual(true);
-                            redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                        }
-                    }
-                }
+                redactionLogEntry.setId(entityPositionSequence.getId());

                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
@@ -250,17 +124,10 @@ public class RedactionLogCreatorService {
                            .flatMap(seq -> seq.getTextPositions().stream())
                            .collect(Collectors.toList()), page);

-                    if (manualRedactions != null) {
-                        comments = manualRedactions.getComments().get(entityPositionSequence.getId());
-                    }
-
-                    redactionLogEntry.setComments(comments);
                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);

                }

-                redactionLogEntry.setId(entityPositionSequence.getId());
-
                // FIXME ids should never be null. Figure out why this happens.
                if (redactionLogEntry.getId() != null) {
                    redactionLogEntities.add(redactionLogEntry);
@@ -276,20 +143,33 @@ public class RedactionLogCreatorService {

        List<Rectangle> rectangles = new ArrayList<>();
        if (textPositions.size() == 1) {
-            rectangles.add( TextPositionSequence.fromData(textPositions, page).getRectangle());
+            rectangles.add(TextPositionSequence.fromData(textPositions, page).getRectangle());
        } else {
+            float x = textPositions.get(0).getXDirAdj();
            float y = textPositions.get(0).getYDirAdj();
+            float width = textPositions.get(0).getWidth();
+            float height = textPositions.get(0).getHeightDir();
            int startIndex = 0;
+
            for (int i = 1; i < textPositions.size(); i++) {
+                float xDirAdj = textPositions.get(i).getXDirAdj();
                float yDirAdj = textPositions.get(i).getYDirAdj();
-                if (yDirAdj != y) {
-                    rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, i), page).getRectangle());
+                float widthDir = textPositions.get(i).getWidth();
+                float heightDir = textPositions.get(i).getHeightDir();
+
+                if (!(isCharInSameLine(y, yDirAdj, height, heightDir) && isCharClose(x, xDirAdj, width))) {
+                    rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, i), page)
+                            .getRectangle());
                    y = yDirAdj;
+                    width = widthDir;
+                    height = heightDir;
                    startIndex = i;
                }
+                x = xDirAdj;
            }
            if (startIndex != textPositions.size()) {
-                rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page).getRectangle());
+                rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page)
+                        .getRectangle());
            }
        }

@@ -297,80 +177,45 @@ public class RedactionLogCreatorService {
    }


-    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, int page,
-                                                       String ruleSetId) {
+    private boolean isCharClose(float x, float xDirAdj, float width) {

-        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
+        float max = x + (5 * width);
+        if (xDirAdj < max) {
+            return true;
+        }
+        return false;
+    }

-        if (manualAdds == null) {
-            return redactionLogEntities;
+
+    private boolean isCharInSameLine(float y, float yCompare, float height, float heightCompare) {
+
+        float offsetHeight = height / 2;
+        float minHeight = height - offsetHeight;
+        float maxHeight = height + offsetHeight;
+
+        float offsetY = height / 10;
+        float minY = y - offsetY;
+        float maxY = y + offsetY;
+
+        if (yCompare > minY && yCompare < maxY && heightCompare > minHeight && heightCompare < maxHeight) {
+            return true;
        }

-        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
-
-            String id = manualRedactionEntry.getId();
-
-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id, ruleSetId);
-
-            List<Rectangle> rectanglesOnPage = new ArrayList<>();
-            for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-                if (page == rectangle.getPage()) {
-                    rectanglesOnPage.add(rectangle);
-                    redactionLogEntry.getPositions().add(rectangle);
-                }
-            }
-
-            redactionLogEntry.setComments(comments.get(id));
-            if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                redactionLogEntities.add(redactionLogEntry);
-            }
-        }
-
-        return redactionLogEntities;
+        return false;
    }


-    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
-
-        return manualRedactionEntry.getStatus().equals(Status.APPROVED) && manualRedactionEntry.isAddToDictionary();
-    }
-
-
-    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
-                                                      String ruleSetId) {
+    private RedactionLogEntry createRedactionLogEntry(Entity entity, String dossierTemplateId) {

        return RedactionLogEntry.builder()
-                .id(id)
-                .color(getColorForManualAdd(manualRedactionEntry.getType(), ruleSetId, manualRedactionEntry.getStatus()))
-                .reason(manualRedactionEntry.getReason())
-                .legalBasis(manualRedactionEntry.getLegalBasis())
-                .value(manualRedactionEntry.getValue())
-                .type(manualRedactionEntry.getType())
-                .redacted(true)
-                .isHint(false)
-                .section(manualRedactionEntry.getSection())
-                .sectionNumber(manualRedactionEntry.getSectionNumber())
-                .manual(true)
-                .status(manualRedactionEntry.getStatus())
-                .manualRedactionType(ManualRedactionType.ADD)
-                .isDictionaryEntry(false)
-                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
-                .build();
-    }
-
-
-    private RedactionLogEntry createRedactionLogEntry(Entity entity, String ruleSetId) {
-
-        return RedactionLogEntry.builder()
-                .color(getColor(entity, ruleSetId, false))
+                .color(getColor(entity.getType(), dossierTemplateId, entity.isRedaction()))
                .reason(entity.getRedactionReason())
                .legalBasis(entity.getLegalBasis())
                .value(entity.getWord())
                .type(entity.getType())
                .redacted(entity.isRedaction())
-                .isHint(isHint(entity, ruleSetId))
-                .isRecommendation(isRecommendation(entity, ruleSetId))
+                .isHint(isHint(entity.getType(), dossierTemplateId))
+                .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
@@ -384,59 +229,6 @@ public class RedactionLogCreatorService {
    }


-    private float[] getColor(Entity entity, String ruleSetId, boolean requestedToRemove) {
-
-        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor(ruleSetId);
-        }
-        if (!entity.isRedaction() && !isHint(entity, ruleSetId)) {
-            return dictionaryService.getNotRedactedColor(ruleSetId);
-        }
-        return dictionaryService.getColor(entity.getType(), ruleSetId);
-    }
-
-
-    private float[] getColorForManualAdd(String type, String ruleSetId, Status status) {
-
-        if (status.equals(Status.REQUESTED)) {
-            return dictionaryService.getRequestAddColor(ruleSetId);
-        } else if (status.equals(Status.DECLINED)) {
-            return dictionaryService.getNotRedactedColor(ruleSetId);
-        }
-        return getColor(type, ruleSetId);
-    }
-
-
-    private float[] getColor(String type, String ruleSetId) {
-
-        return dictionaryService.getColor(type, ruleSetId);
-    }
-
-
-    private float[] getColorForImage(Image image, String ruleSetId, boolean requestedToRemove) {
-
-        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor(ruleSetId);
-        }
-        if (!image.isRedaction() && !dictionaryService.isHint(image.getType(), ruleSetId)) {
-            return dictionaryService.getNotRedactedColor(ruleSetId);
-        }
-        return dictionaryService.getColor(image.getType(), ruleSetId);
-    }
-
-
-    private boolean isHint(Entity entity, String ruleSetId) {
-
-        return dictionaryService.isHint(entity.getType(), ruleSetId);
-    }
-
-
-    private boolean isRecommendation(Entity entity, String ruleSetId) {
-
-        return dictionaryService.isRecommendation(entity.getType(), ruleSetId);
-    }
-
-
    private void addSectionGrid(Document classifiedDoc, int page) {

        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
@@ -454,8 +246,8 @@ public class RedactionLogCreatorService {
                    classifiedDoc.getSectionGrid()
                            .getRectanglesPerPage()
                            .computeIfAbsent(page, (x) -> new ArrayList<>())
-                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
-                                    .getHeight(), i + 1, paragraph.getPageBlocks().size()));
+                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock.getHeight(), i + 1, paragraph.getPageBlocks()
+                                    .size()));

                } else if (textBlock instanceof Table) {

@@ -463,8 +255,7 @@ public class RedactionLogCreatorService {
                    for (List<Cell> row : ((Table) textBlock).getRows()) {
                        for (Cell cell : row) {
                            if (cell != null) {
-                                cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                                        .getWidth(), (float) cell.getHeight()));
+                                cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell.getWidth(), (float) cell.getHeight()));
                            }
                        }
                    }
@@ -472,12 +263,33 @@ public class RedactionLogCreatorService {
                    classifiedDoc.getSectionGrid()
                            .getRectanglesPerPage()
                            .computeIfAbsent(page, (x) -> new ArrayList<>())
-                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
-                                    .getHeight(), i + 1, paragraph.getPageBlocks().size(), cellRectangles));
+                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock.getHeight(), i + 1, paragraph.getPageBlocks()
+                                    .size(), cellRectangles));

                }
            }
        }
    }

+
+    private float[] getColor(String type, String dossierTemplateId, boolean isRedaction) {
+
+        if (!isRedaction && !isHint(type, dossierTemplateId)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    private boolean isHint(String type, String dossierTemplateId) {
+
+        return dictionaryService.isHint(type, dossierTemplateId);
+    }
+
+
+    private boolean isRecommendation(String type, String dossierTemplateId) {
+
+        return dictionaryService.isRecommendation(type, dossierTemplateId);
+    }
+
 }
@@ -0,0 +1,356 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.model.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class RedactionLogMergeService {
+
+    private final DictionaryService dictionaryService;
+    private final SectionTextService sectionTextService;
+
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid, String dossierTemplateId,
+                                              ManualRedactions manualRedactions, Set<Integer> excludedPages) {
+
+        log.info("Merging Redaction log with manual redactions {}", manualRedactions);
+        if (manualRedactions != null) {
+
+            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
+
+            redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
+
+            var manualRedactionWrappers = createManualRedactionWrappers(manualRedactions);
+
+            for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+
+                processRedactionLogEntry(manualRedactionWrappers.stream()
+                        .filter(mr -> entry.getId().equals(mr.getId()))
+                        .collect(Collectors.toList()), dossierTemplateId, entry);
+
+                entry.setComments(manualRedactions.getComments().get(entry.getId()));
+
+                if (excludedPages != null && !excludedPages.isEmpty()) {
+                    entry.getPositions().forEach(pos -> {
+                        if (excludedPages.contains(pos.getPage())) {
+                            entry.setExcluded(true);
+                        }
+                    });
+                }
+            }
+
+        }
+
+        Set<String> processedIds = new HashSet<>();
+        redactionLog.getRedactionLogEntry().removeIf(entry -> {
+            if(processedIds.contains(entry.getId())){
+                return true;
+            }
+            processedIds.add(entry.getId());
+            return false;
+        });
+        return redactionLog;
+    }
+
+
+    private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {
+
+        List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();
+
+        manualRedactions.getImageRecategorizations().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getIdsToRemove().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getForceRedacts().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getManualLegalBasisChanges().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        Collections.sort(manualRedactionWrappers);
+
+        return manualRedactionWrappers;
+    }
+
+
+    private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers,
+                                          String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
+
+        manualRedactionWrappers.forEach(mrw -> {
+
+            if (mrw.getItem() instanceof ManualImageRecategorization) {
+                var imageRecategorization = (ManualImageRecategorization) mrw.getItem();
+                String manualOverrideReason = null;
+                if (imageRecategorization.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    redactionLogEntry.setType(imageRecategorization.getType());
+                    redactionLogEntry.setHasBeenRecategorized(true);
+
+                    if (dictionaryService.isHint(imageRecategorization.getType(), dossierTemplateId)) {
+                        redactionLogEntry.setRedacted(false);
+                        redactionLogEntry.setHint(true);
+                    } else {
+                        redactionLogEntry.setHint(false);
+                    }
+
+                    redactionLogEntry.setSection("Image:" + redactionLogEntry.getType());
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
+                } else if (imageRecategorization.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setRecategorizationType(imageRecategorization.getType());
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setManualRedactionUserId(imageRecategorization.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
+            }
+
+            if (mrw.getItem() instanceof IdRemoval) {
+                var manualRemoval = (IdRemoval) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualRemoval.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setRedacted(false);
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), true));
+                    redactionLogEntry.setHint(false);
+                    redactionLogEntry.setHasBeenRemovedByManualOverride(true);
+                } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionUserId(manualRemoval.getUser());
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
+                redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
+                redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
+            }
+
+            if (mrw.getItem() instanceof ManualForceRedact) {
+                var manualForceRedact = (ManualForceRedact) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
+
+                    // Forcing a skipped hint should result in a hint
+                    if (dictionaryService.isHint(redactionLogEntry.getType(), dossierTemplateId)) {
+                        redactionLogEntry.setHint(true);
+                    } else {
+                        redactionLogEntry.setRedacted(true);
+                    }
+
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
+                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                    redactionLogEntry.setHasBeenForced(true);
+                } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setManualRedactionUserId(manualForceRedact.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
+
+            }
+
+            if (mrw.getItem() instanceof ManualLegalBasisChange) {
+                var manualLegalBasisChange = (ManualLegalBasisChange) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    redactionLogEntry.setRedacted(true);
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
+                    redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
+                    if (manualLegalBasisChange.getSection() != null) {
+                        redactionLogEntry.setSection(manualLegalBasisChange.getSection());
+                    }
+                    if (redactionLogEntry.isRectangle() && manualLegalBasisChange.getValue() != null) {
+                        redactionLogEntry.setValue(manualLegalBasisChange.getValue());
+                    }
+                    redactionLogEntry.setHasLegalBasisChanged(true);
+                } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+
+                redactionLogEntry.setManualRedactionUserId(manualLegalBasisChange.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
+            }
+
+        });
+
+    }
+
+
+    private String mergeReasonIfNecessary(String currentReason, String addition) {
+
+        if (currentReason != null) {
+            if (!currentReason.contains(addition)) {
+                return currentReason + addition;
+            }
+            return currentReason;
+        } else {
+            return "";
+        }
+    }
+
+
+    private List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid,
+                                                        Set<ManualRedactionEntry> manualAdds,
+                                                        Map<String, List<Comment>> comments, String dossierTemplateId) {
+
+        List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();
+
+        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
+
+            if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) {
+
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry
+                        .getId(), dossierTemplateId);
+                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getId()));
+
+                sectionTextService.handleSectionText(sectionGrid, redactionLogEntry);
+
+                redactionLogEntries.add(redactionLogEntry);
+
+            }
+        }
+
+        return redactionLogEntries;
+    }
+
+
+    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+
+        return manualRedactionEntry.getStatus()
+                .equals(Status.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
+                                                      String dossierTemplateId) {
+
+        return RedactionLogEntry.builder()
+                .id(id)
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
+                .reason(manualRedactionEntry.getReason())
+                .isDictionaryEntry(manualRedactionEntry.isAddToDictionary())
+                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
+                .legalBasis(manualRedactionEntry.getLegalBasis())
+                .value(manualRedactionEntry.getValue())
+                .section(manualRedactionEntry.getSection())
+                .type(manualRedactionEntry.getType())
+                .rectangle(manualRedactionEntry.isRectangle())
+                .redacted(true)
+                .isHint(false)
+                .sectionNumber(-1)
+                .manual(true)
+                .status(manualRedactionEntry.getStatus())
+                .manualRedactionType(ManualRedactionType.ADD)
+                .positions(manualRedactionEntry.getPositions())
+                .manualRedactionUserId(manualRedactionEntry.getUser())
+                .build();
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction,
+                             boolean skipped) {
+
+        if (requested) {
+            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
+        }
+        if (skipped || !isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    private float[] getColorForManualAdd(String type, String dossierTemplateId, Status status) {
+
+        if (status.equals(Status.REQUESTED)) {
+            return dictionaryService.getRequestAddColor(dossierTemplateId);
+        } else if (status.equals(Status.DECLINED)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return getColor(type, dossierTemplateId);
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId) {
+
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    @Data
+    @AllArgsConstructor
+    private static class ManualRedactionWrapper implements Comparable<ManualRedactionWrapper> {
+
+        private String id;
+        private OffsetDateTime date;
+        private Object item;
+
+
+        @Override
+        public int compareTo(ManualRedactionWrapper o) {
+
+            return this.date.compareTo(o.date);
+        }
+
+    }
+
+}
+
@@ -0,0 +1,42 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class SectionTextService {
+
+
+    public void handleSectionText(SectionGrid sectionGrid, RedactionLogEntry redactionLogEntry) {
+
+        log.info("Handling manual redaction match for sections: {} and entry section: {}, positions: {}",
+                sectionGrid != null ? sectionGrid.getSections().size() : "null", redactionLogEntry.getSection(), redactionLogEntry.getPositions());
+
+        if (redactionLogEntry.getSection() != null) {
+            // set by UI
+            return;
+        }
+
+        if (sectionGrid != null) {
+            var firstPosition = !redactionLogEntry.getPositions().isEmpty() ? redactionLogEntry.getPositions().iterator().next() : null;
+
+            if (firstPosition != null) {
+
+                for (var section : sectionGrid.getSections()) {
+                    if (section.getPages().contains(firstPosition.getPage())) {
+                        for (var sectionArea : section.getSectionAreas()) {
+                            if (sectionArea.contains(firstPosition)) {
+                                redactionLogEntry.setSection(section.getHeadline());
+                                redactionLogEntry.setSectionNumber(section.getSectionNumber());
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
@@ -1,23 +1,30 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;

+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;

-import java.util.*;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
@Slf4j
@UtilityClass
@SuppressWarnings("PMD")
 public class EntitySearchUtils {

-
    public boolean sectionContainsAny(String sectionText, Set<DictionaryIncrementValue> values) {

        String inputString = sectionText.toLowerCase(Locale.ROOT);
@@ -38,9 +45,7 @@ public class EntitySearchUtils {

                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    if (value.isCaseinsensitive() || !value.isCaseinsensitive() && sectionText.substring(startIndex, stopIndex).equals(value.getValue())) {
-                        return true;
-                    }
+                    return true;
                }
            } while (startIndex > -1);
        }
@@ -98,8 +103,8 @@ public class EntitySearchUtils {
                    .sorted(Comparator.comparing(Entity::getStart))
                    .collect(Collectors.toList());
            Entity firstEntity = orderedEntities.get(0);
-            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord().trim(), dictionary.isCaseInsensitiveDictionary(firstEntity
-                    .getType()), firstEntity.getTargetSequences());
+            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord()
+                    .trim(), dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());

            for (int i = 0; i <= orderedEntities.size() - 1; i++) {
                try {
@@ -133,6 +138,7 @@ public class EntitySearchUtils {


    public void addEntitiesWithHigherRank(Set<Entity> entities, Set<Entity> found, Dictionary dictionary) {
+
        found.forEach(f -> addEntitiesWithHigherRank(entities, f, dictionary));
    }

@@ -148,9 +154,49 @@ public class EntitySearchUtils {
        entities.add(found);
    }

+
    public void addEntitiesIgnoreRank(Set<Entity> entities, Set<Entity> found) {
        // HashSet keeps old value but we want the new.
        entities.removeAll(found);
        entities.addAll(found);
+
+        removeEntitiesContainedInLarger(entities);
    }
+
+
+    public Set<Entity> findNonOverlappingMatchEntities(Set<Entity> existingEntities, Set<Entity> foundEntities) {
+
+        Set<Entity> result = new HashSet<>();
+        if (existingEntities != null && foundEntities != null) {
+            for (Entity foundEntity : foundEntities) {
+
+                if (!overlaps(existingEntities, foundEntity)) {
+                    result.add(foundEntity);
+                }
+
+            }
+        }
+        return result;
+    }
+
+
+    private boolean overlaps(Set<Entity> existingEntities, Entity found) {
+
+        for (Entity existing : existingEntities) {
+
+            if(existing.getStart().equals(found.getStart())){
+                continue;
+            }
+
+            for (int i = existing.getStart(); i <= existing.getEnd(); i++) {
+                for (int j = found.getStart(); j <= found.getEnd(); j++) {
+                    if (i == j) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
 }
@@ -12,7 +12,7 @@ public class TextNormalizationUtilities {
     * @return Text without line-break hyphenation.
     */
    public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R|\n\r(.+ )", "$1$2");
+        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R", "$1");
    }

 }
@@ -0,0 +1,165 @@
+package com.iqser.red.service.redaction.v1.server.segmentation;
+
+import java.awt.Graphics;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageMergeService {
+
+
+    public List<PdfImage> mergeImages(List<PdfImage> images, int rotation){
+
+        List<PdfImage> mergedList = processImages(images, rotation);
+
+        List<PdfImage> imagesInImage = new ArrayList<>();
+        for(PdfImage image: mergedList){
+            for (PdfImage inner: mergedList){
+                if(image != inner && image.getPosition().contains(inner.getPosition().getX(), inner.getPosition().getY(), inner.getPosition().getWidth(), inner.getPosition().getHeight())){
+                    imagesInImage.add(inner);
+                }
+            }
+        }
+        mergedList.removeAll(imagesInImage);
+
+        return mergedList;
+    }
+
+
+    //merge images, if they are separated during pdf import, return new list of Pdfimages
+    private List<PdfImage> processImages(List<PdfImage> imageList, int rotation) {
+        if (imageList.size() > 1) {
+            List<PdfImage> mergedList = new ArrayList<>();
+            int countElementsInList = 0;
+            boolean beginImage = true;
+
+            // a List of Boolean, true = candidate for merging, false = no merging
+            List<Boolean> candidatesList = getCandidatesList(imageList, rotation);
+
+            // loop through list, if there are candidates for merging (true), merge images and add it to mergedList
+            for (int i = 0; i < candidatesList.size(); i++) {
+                if (candidatesList.get(i)) {
+                    if (beginImage) {
+                        //begin of image, merge two parts of imageList
+                        PdfImage mergedImage = mergeTwoImages(imageList.get(i), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.add(mergedImage);
+                            countElementsInList++;
+                        }
+                    } else {
+                        //middle of an image, merge current piece auf mergedList with image of imageList
+                        PdfImage mergedImage = mergeTwoImages(mergedList.get(countElementsInList - 1), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.set(countElementsInList - 1, mergedImage);
+                        }
+                    }
+                    beginImage = false;
+                } else {
+                    // if the last candidate is false, then both images i and i+1 must be added
+                    if (i == candidatesList.size() - 1) {
+                        if (countElementsInList > 0 && mergedList.get(countElementsInList - 1) == imageList.get(i)) {
+                            mergedList.add(imageList.get(i + 1));
+                        } else {
+                            mergedList.add(imageList.get(i));
+                            mergedList.add(imageList.get(i + 1));
+                        }
+                    } else {
+                        //first image is not splitted, add i to resultlist
+                        if (beginImage) {
+                            mergedList.add(imageList.get(i));
+                            countElementsInList++;
+                        } else {
+                            // i is the end of an image, add begin of new image
+                            mergedList.add(imageList.get(i + 1));
+                            countElementsInList++;
+                            beginImage = false;
+                        }
+                    }
+                }
+            }
+            return mergedList;
+        } else {
+            return imageList;
+        }
+    }
+
+    private PdfImage mergeTwoImages(PdfImage image1, PdfImage image2, int rotation) {
+
+        // diese Angaben von getPosition scheinen nicht richtig zu sein, damit werden teile des Bildes abgeschnitten
+        double width = image1.getPosition().getWidth();
+        double width2 = image2.getPosition().getWidth();
+        double height1 = image1.getPosition().getHeight();
+        double height2 = image2.getPosition().getHeight();
+        // mit  den Werten, die unter Image gespeichert sind, funktioniert es
+        double img1height = image1.getImage().getHeight();
+        double img1width = image1.getImage().getWidth();
+        double img2height = image2.getImage().getHeight();
+
+        BufferedImage mergedImage = new BufferedImage((int) img1width, (int) (img1height + img2height), BufferedImage.TYPE_INT_RGB);
+        Graphics mergedImageGraphics = mergedImage.getGraphics();
+        try {
+            mergedImageGraphics.drawImage(image1.getImage(), 0, 0, null);
+            mergedImageGraphics.drawImage(image2.getImage(), 0, (int) (img1height), null);
+
+            // set Image, Position and type for merged Image
+            //set position for merged image with values of image1 and the height of both
+            Rectangle2D pos = new Rectangle2D.Float();
+            pos.setRect(image1.getPosition().getX(), image2.getPosition().getY(), rotation == 90 ? width + width2: width, rotation == 90 ? height1 : height1 + height2);
+            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage(), image1.isHasTransparency() || image2.isHasTransparency());
+            // Graphics need to be disposed
+
+            image1.getImage().flush();
+            image2.getImage().flush();
+
+            mergedImage.flush();
+            mergedImageGraphics.dispose();
+
+            return newPdfImage;
+        } catch (Exception e) {
+            // failed to merge image
+            log.error("Failed to merge image", e);
+            return null;
+        }
+
+
+    }
+
+    //make a list of true and false, if the image is a candidate for merging
+    private List<Boolean> getCandidatesList(List<PdfImage> imageList, int rotation) {
+        List<Boolean> candidatesList = new ArrayList<>();
+        for (int i = 0; i < imageList.size(); i++) {
+            if (i >= 1) {
+                candidatesList.add(isCandidateForMerging(imageList.get(i - 1), imageList.get(i), rotation));
+            }
+        }
+        return candidatesList;
+    }
+
+    // evaluate if two images are candidates for merging, depending on their coordinates, width and height
+    private boolean isCandidateForMerging(PdfImage image1, PdfImage image2, int rotation) {
+        double x1 = rotation == 90 ? image1.getPosition().getY() : image1.getPosition().getX();
+        double y1 = rotation == 90 ? image1.getPosition().getX() : image1.getPosition().getY();
+        double width1 = rotation == 90 ? image1.getPosition().getHeight() : image1.getPosition().getWidth();
+        double x2 = rotation == 90 ? image2.getPosition().getY() : image2.getPosition().getX();
+        double y2 = rotation == 90 ? image2.getPosition().getX() : image2.getPosition().getY();
+        double width2 = rotation == 90 ? image2.getPosition().getHeight() : image2.getPosition().getWidth();
+        double height2 = rotation == 90 ? image2.getPosition().getWidth() : image2.getPosition().getHeight();
+        //if the x-coordinates and widths of images are equal and the height is equal to difference between y-coordinates,
+        // then it is the same picture and has to be merged -> return true
+        return x1 == x2 && width1 == width2 && Math.ceil(height2) == Math.ceil(rotation == 90 ? y2 - y1 : y1 - y2) && width2 > (height2 / 6);
+    }
+
+}
@@ -1,5 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;

+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -14,24 +28,9 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractT
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.springframework.stereotype.Service;
-
-import java.awt.Graphics;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;

@Slf4j
@Service
@@ -46,13 +45,17 @@ public class PdfSegmentationService {
    private final ClassificationService classificationService;
    private final SectionsBuilderService sectionsBuilderService;
    private final ImageClassificationService imageClassificationService;
+    private final ImageMergeService imageMergeService;


    public Document parseDocument(InputStream documentInputStream) throws IOException {
+
        return parseDocument(documentInputStream, false);
    }

+
    public Document parseDocument(InputStream documentInputStream, boolean ignoreImages) throws IOException {
+
        PDDocument pdDocument = null;
        try {
            //create tempFile
@@ -63,7 +66,6 @@ public class PdfSegmentationService {
            Document document = new Document();
            List<Page> pages = new ArrayList<>();

-
            pdDocument = reinitializePDDocument(tempFile, null);
            long pageCount = pdDocument.getNumberOfPages();

@@ -93,24 +95,26 @@ public class PdfSegmentationService {
                Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings
                        .getVertical());

+                PDRectangle cropbox = pdPage.getCropBox();
+                float cropboxArea = cropbox.getHeight() * cropbox.getWidth();
+                page.setCropBoxArea(cropboxArea);
+
                page.setRotation(rotation);
                page.setLandscape(isLandscape || isRotated);
                page.setPageNumber(pageNumber);
-                List<PdfImage> mergedList = processImages(stripper.getImages());
+
+                List<PdfImage> mergedList = imageMergeService.mergeImages(stripper.getImages(), rotation);
                page.setImages(mergedList);

                tableExtractionService.extractTables(cleanRulings, page);
                buildPageStatistics(page);
                increaseDocumentStatistics(page, document);

-
                if (!ignoreImages) {
                    imageClassificationService.classifyImages(page);
                }

                pages.add(page);
-
-
            }

            document.setPages(pages);
@@ -133,7 +137,9 @@ public class PdfSegmentationService {
        }
    }

+
    private PDDocument reinitializePDDocument(File tempFile, PDDocument pdDocument) throws IOException {
+
        if (pdDocument != null) {
            pdDocument.close();
        }
@@ -148,130 +154,6 @@ public class PdfSegmentationService {
        return newPDDocument;
    }

-    //merge images, if they are separated during pdf import, return new list of Pdfimages
-    private List<PdfImage> processImages(List<PdfImage> imageList) {
-        if (imageList.size() > 1) {
-            List<PdfImage> mergedList = new ArrayList<>();
-            int countElementsInList = 0;
-            boolean beginImage = true;
-
-            // a List of Boolean, true = candidate for merging, false = no merging
-            List<Boolean> candidatesList = getCandidatesList(imageList);
-
-            // loop through list, if there are candidates for merging (true), merge images and add it to mergedList
-            for (int i = 0; i < candidatesList.size(); i++) {
-                if (candidatesList.get(i)) {
-                    if (beginImage) {
-                        //begin of image, merge two parts of imageList
-                        PdfImage mergedImage = mergeTwoImages(imageList.get(i), imageList.get(i + 1));
-                        // image merge successful
-                        if (mergedImage != null) {
-                            mergedList.add(mergedImage);
-                            countElementsInList++;
-                        }
-                    } else {
-                        //middle of an image, merge current piece auf mergedList with image of imageList
-                        PdfImage mergedImage = mergeTwoImages(mergedList.get(countElementsInList - 1), imageList.get(i + 1));
-                        // image merge successful
-                        if (mergedImage != null) {
-                            mergedList.set(countElementsInList - 1, mergedImage);
-                        }
-                    }
-                    beginImage = false;
-                } else {
-                    // if the last candidate is false, then both images i and i+1 must be added
-                    if (i == candidatesList.size() - 1) {
-                        if (countElementsInList > 0 && mergedList.get(countElementsInList - 1) == imageList.get(i)) {
-                            mergedList.add(imageList.get(i + 1));
-                        } else {
-                            mergedList.add(imageList.get(i));
-                            mergedList.add(imageList.get(i + 1));
-                        }
-                    } else {
-                        //first image is not splitted, add i to resultlist
-                        if (beginImage) {
-                            mergedList.add(imageList.get(i));
-                            countElementsInList++;
-                        } else {
-                            // i is the end of an image, add begin of new image
-                            mergedList.add(imageList.get(i + 1));
-                            countElementsInList++;
-                            beginImage = false;
-                        }
-                    }
-                }
-            }
-            return mergedList;
-        } else {
-            return imageList;
-        }
-    }
-
-    private PdfImage mergeTwoImages(PdfImage image1, PdfImage image2) {
-
-        // diese Angaben von getPosition scheinen nicht richtig zu sein, damit werden teile des Bildes abgeschnitten
-        double width = image1.getPosition().getWidth();
-        double height1 = image1.getPosition().getHeight();
-        double height2 = image2.getPosition().getHeight();
-        // mit  den Werten, die unter Image gespeichert sind, funktioniert es
-        double img1height = image1.getImage().getHeight();
-        double img1width = image1.getImage().getWidth();
-        double img2height = image2.getImage().getHeight();
-
-        BufferedImage mergedImage = new BufferedImage((int) img1width, (int) (img1height + img2height), BufferedImage.TYPE_INT_RGB);
-        Graphics mergedImageGraphics = mergedImage.getGraphics();
-        try {
-            mergedImageGraphics.drawImage(image1.getImage(), 0, 0, null);
-            mergedImageGraphics.drawImage(image2.getImage(), 0, (int) (img1height), null);
-
-            // set Image, Position and type for merged Image
-            //set position for merged image with values of image1 and the height of both
-            Rectangle2D pos = new Rectangle2D.Float();
-            pos.setRect(image1.getPosition().getX(), image2.getPosition().getY(), width, height1 + height2);
-            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage());
-            // Graphics need to be disposed
-
-            image1.getImage().flush();
-            image2.getImage().flush();
-
-            mergedImage.flush();
-            mergedImageGraphics.dispose();
-
-            return newPdfImage;
-        } catch (Exception e) {
-            // failed to merge image
-            log.error("Failed to merge image", e);
-            return null;
-        }
-
-
-    }
-
-    //make a list of true and false, if the image is a candidate for merging
-    private List<Boolean> getCandidatesList(List<PdfImage> imageList) {
-        List<Boolean> candidatesList = new ArrayList<>();
-        for (int i = 0; i < imageList.size(); i++) {
-            if (i >= 1) {
-                candidatesList.add(isCandidateForMerging(imageList.get(i - 1), imageList.get(i)));
-            }
-        }
-        return candidatesList;
-    }
-
-    // evaluate if two images are candidates for merging, depending on their coordinates, width and height
-    private boolean isCandidateForMerging(PdfImage image1, PdfImage image2) {
-        double x1 = image1.getPosition().getX();
-        double y1 = image1.getPosition().getY();
-        double width1 = image1.getPosition().getWidth();
-        double x2 = image2.getPosition().getX();
-        double y2 = image2.getPosition().getY();
-        double width2 = image2.getPosition().getWidth();
-        double height2 = image2.getPosition().getHeight();
-        //if the x-coordinates and widths of images are equal and the height is equal to difference between y-coordinates,
-        // then it is the same picture and has to be merged -> return true
-        return x1 == x2 && width1 == width2 && Math.ceil(height2) == Math.ceil(y1 - y2) && width2 > (height2 / 6);
-    }
-

    private void increaseDocumentStatistics(Page page, Document document) {

@@ -303,5 +185,4 @@ public class PdfSegmentationService {

    }

-
 }
@@ -13,4 +13,8 @@ public class RedactionServiceSettings {

    private boolean enableImageClassification = true;

+    private float maxImageCropboxRatio = 0.9f;
+
+    private int analysisVersion = 1;
+
 }
@@ -32,16 +32,16 @@ public class RedactionStorageService {


    @SneakyThrows
-    public void storeObject(String projectId, String fileId, FileType fileType, Object any) {
-        storageService.storeObject(StorageIdUtils.getStorageId(projectId, fileId, fileType), objectMapper.writeValueAsBytes(any));
+    public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
+        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), objectMapper.writeValueAsBytes(any));
    }


-    public RedactionLog getRedactionLog(String projectId, String fileId) {
+    public RedactionLog getRedactionLog(String dossierId, String fileId) {

        InputStreamResource inputStreamResource;
        try {
-            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(projectId, fileId, FileType.REDACTION_LOG));
+            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.REDACTION_LOG));
        } catch (StorageObjectDoesNotExist e) {
            log.debug("Text not available.");
            return null;
@@ -55,11 +55,11 @@ public class RedactionStorageService {
    }


-    public Text getText(String projectId, String fileId) {
+    public Text getText(String dossierId, String fileId) {

        InputStreamResource inputStreamResource;
        try {
-            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(projectId, fileId, FileType.TEXT));
+            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.TEXT));
        } catch (StorageObjectDoesNotExist e) {
            log.debug("Text not available.");
            return null;
@@ -73,9 +73,9 @@ public class RedactionStorageService {
    }


-    public SectionGrid getSectionGrid(String projectId, String fileId) {
+    public SectionGrid getSectionGrid(String dossierId, String fileId) {

-        var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(projectId, fileId, FileType.SECTION_GRID));
+        var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
        try {
            return objectMapper.readValue(sectionGrid.getInputStream(), SectionGrid.class);
        } catch (IOException e) {
@@ -83,7 +83,6 @@ public class RedactionStorageService {
        }
    }

-
    @RequiredArgsConstructor
    public enum StorageType {
        PARSED_DOCUMENT(".json");
@@ -95,8 +94,8 @@ public class RedactionStorageService {

    public static class StorageIdUtils {

-        public static String getStorageId(String projectId, String fileId, FileType fileType) {
-            return projectId + "/" + fileId + "." + fileType.name() + fileType.getExtension();
+        public static String getStorageId(String dossierId, String fileId, FileType fileType) {
+            return dossierId + "/" + fileId + "." + fileType.name() + fileType.getExtension();
        }

    }
@@ -2,6 +2,8 @@ package com.iqser.red.service.redaction.v1.server.tableextraction.model;

 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,6 +20,8 @@ public abstract class AbstractTextContainer {
    protected String classification;
    protected int page;

+    private Orientation orientation = Orientation.NONE;
+
    public abstract String getText();

    public boolean contains(AbstractTextContainer other) {
@@ -246,8 +246,12 @@ public class Ruling extends Line2D.Float {

    public Ruling expand(float amount) {
        Ruling r = (Ruling) this.clone();
-        r.setStart(this.getStart() - amount);
-        r.setEnd(this.getEnd() + amount);
+        try {
+            r.setStart(this.getStart() - amount);
+            r.setEnd(this.getEnd() + amount);
+        } catch (UnsupportedOperationException e){
+            log.warn("Could not expand ruling!");
+        }
        return r;
    }

@@ -102,7 +102,7 @@ public class PdfVisualisationService {

            contentStream.newLineAtOffset(textBlock.getMinX(), textBlock.getMaxY());

-            contentStream.showText(textBlock.getClassification());
+            contentStream.showText(textBlock.getClassification() + textBlock.getOrientation());

            contentStream.endText();
        }
@@ -20,6 +20,8 @@ import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService
 import com.iqser.red.storage.commons.service.StorageService;
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.assertj.core.util.Sets;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -84,7 +86,6 @@ public class RedactionIntegrationTest {

    private static final String PII = "PII";

-
    @Autowired
    private RedactionController redactionController;

@@ -127,9 +128,10 @@ public class RedactionIntegrationTest {
    private final Map<String, Integer> rankTypeMap = new HashMap<>();
    private final Colors colors = new Colors();
    private final Map<String, Long> reanlysisVersions = new HashMap<>();
+    private final Set<String> deleted = new HashSet<>();

-    private final static String TEST_RULESET_ID = "123";
-    private final static String TEST_PROJECT_ID = "123";
+    private final static String TEST_DOSSIER_TEMPLATE_ID = "123";
+    private final static String TEST_DOSSIER_ID = "123";
    private final static String TEST_FILE_ID = "123";

    @Configuration
@@ -152,18 +154,20 @@ public class RedactionIntegrationTest {
            return kieServices.newKieContainer(kieModule.getReleaseId());
        }

+
        @Bean
        @Primary
        public StorageService inmemoryStorage() {
+
            return new FileSystemBackedStorageService();
        }

-
    }


    @After
    public void cleanupStorage() {
+
        if (this.storageService instanceof FileSystemBackedStorageService) {
            ((FileSystemBackedStorageService) this.storageService).clearStorage();
        }
@@ -173,22 +177,23 @@ public class RedactionIntegrationTest {
    @Before
    public void stubClients() {

-        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(0L);
-        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(RULES));
+        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
+        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(new RulesResponse(RULES));

        loadDictionaryForTest();
        loadTypeForTest();
-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(0L);
-        when(dictionaryClient.getAllTypes(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(TypeResponse.builder()
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(0L);
+        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(TypeResponse
+                .builder()
                .types(getTypeResponse())
                .build());

-        when(dictionaryClient.getVersion(TEST_RULESET_ID, TEST_PROJECT_ID)).thenReturn(0L);
-        when(dictionaryClient.getAllTypes(TEST_RULESET_ID, TEST_PROJECT_ID)).thenReturn(TypeResponse.builder()
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID)).thenReturn(0L);
+        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID)).thenReturn(TypeResponse.builder()
                .types(List.of(TypeResult.builder()
                        .type(DOSSIER_REDACTIONS)
-                        .ruleSetId(TEST_RULESET_ID)
-                        .hexColor( "#ffe187")
+                        .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
+                        .hexColor("#ffe187")
                        .isHint(hintTypeMap.get(DOSSIER_REDACTIONS))
                        .isCaseInsensitive(caseInSensitiveMap.get(DOSSIER_REDACTIONS))
                        .isRecommendation(recommendationTypeMap.get(DOSSIER_REDACTIONS))
@@ -196,28 +201,44 @@ public class RedactionIntegrationTest {
                        .build()))
                .build());

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
-        when(dictionaryClient.getDictionaryForType(ADDRESS, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(AUTHOR, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(SPONSOR, false));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
-        when(dictionaryClient.getDictionaryForType(PII, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PII, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
-        when(dictionaryClient.getDictionaryForType(PURITY, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PURITY, false));
-        when(dictionaryClient.getDictionaryForType(IMAGE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(IMAGE, false));
-        when(dictionaryClient.getDictionaryForType(OCR, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(OCR, false));
-        when(dictionaryClient.getDictionaryForType(LOGO, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(LOGO, false));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(SIGNATURE, false));
-        when(dictionaryClient.getDictionaryForType(FORMULA, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(FORMULA, false));
-        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS, TEST_RULESET_ID, TEST_PROJECT_ID)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
-        when(dictionaryClient.getColors(TEST_RULESET_ID)).thenReturn(colors);
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(SPONSOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(SPONSOR, false));
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(HINT_ONLY, false));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(MUST_REDACT, false));
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(TEST_METHOD, false));
+        when(dictionaryClient.getDictionaryForType(PII, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PII, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
+        when(dictionaryClient.getDictionaryForType(PURITY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(PURITY, false));
+        when(dictionaryClient.getDictionaryForType(IMAGE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(IMAGE, false));
+        when(dictionaryClient.getDictionaryForType(OCR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(OCR, false));
+        when(dictionaryClient.getDictionaryForType(LOGO, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(LOGO, false));
+        when(dictionaryClient.getDictionaryForType(SIGNATURE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(SIGNATURE, false));
+        when(dictionaryClient.getDictionaryForType(FORMULA, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(FORMULA, false));
+        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS, TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
+        when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
    }


@@ -461,7 +482,7 @@ public class RedactionIntegrationTest {
                .stream()
                .map(typeColor -> TypeResult.builder()
                        .type(typeColor.getKey())
-                        .ruleSetId(TEST_RULESET_ID)
+                        .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
                        .hexColor(typeColor.getValue())
                        .isHint(hintTypeMap.get(typeColor.getKey()))
                        .isCaseInsensitive(caseInSensitiveMap.get(typeColor.getKey()))
@@ -477,7 +498,8 @@ public class RedactionIntegrationTest {

        return DictionaryResponse.builder()
                .hexColor(typeColorMap.get(type))
-                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary.get(type)))
+                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary
+                        .get(type)))
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
                .isRecommendation(recommendationTypeMap.get(type))
@@ -490,7 +512,8 @@ public class RedactionIntegrationTest {

        List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
        entries.forEach(entry -> {
-            dictionaryEntries.add(new DictionaryEntry(entry, reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L, false));
+            dictionaryEntries.add(new DictionaryEntry(entry, reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L, deleted
+                    .contains(entry) ? true : false));
        });
        return dictionaryEntries;
    }
@@ -498,6 +521,7 @@ public class RedactionIntegrationTest {

    @Test
    public void test270Rotated() {
+
        AnalyzeRequest request = prepareStorage("files/Minimal Examples/270Rotated.pdf");
        MemoryStats.printMemoryStats();
        AnalyzeResult result = reanalyzeService.analyze(request);
@@ -508,12 +532,14 @@ public class RedactionIntegrationTest {
    @Test
    @Ignore
    public void testLargeScannedFileOOM() {
+
        AnalyzeRequest request = prepareStorage("scanned/VV-377031.pdf");
        MemoryStats.printMemoryStats();
        AnalyzeResult result = reanalyzeService.analyze(request);
        assertThat(result).isNotNull();
    }

+
    @Test
    public void testMergedImages() throws IOException {

@@ -525,7 +551,7 @@ public class RedactionIntegrationTest {

        Map<String, List<RedactionLogEntry>> duplicates = new HashMap<>();

-        var redactionLog = redactionStorageService.getRedactionLog(TEST_PROJECT_ID, TEST_FILE_ID);
+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

        redactionLog.getRedactionLogEntry().forEach(entry -> {
            duplicates.computeIfAbsent(entry.getId(), v -> new ArrayList<>()).add(entry);
@@ -536,14 +562,14 @@ public class RedactionIntegrationTest {
        });

        dictionary.get(AUTHOR).add("Drinking water");
-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(1L);
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(1L);

        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .projectId(TEST_PROJECT_ID)
+                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated3.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated3.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
        long rstart = System.currentTimeMillis();
@@ -552,14 +578,13 @@ public class RedactionIntegrationTest {
        long rend = System.currentTimeMillis();
        System.out.println("reanalysis analysis duration: " + (rend - rstart));

-
        long end = System.currentTimeMillis();

        System.out.println("duration: " + (end - start));

-
    }

+
    @Test
    @Ignore
    public void noExceptionShouldBeThrownForAnyFiles() throws IOException {
@@ -581,7 +606,7 @@ public class RedactionIntegrationTest {

            Map<String, List<RedactionLogEntry>> duplicates = new HashMap<>();

-            var redactionLog = redactionStorageService.getRedactionLog(TEST_PROJECT_ID, TEST_FILE_ID);
+            var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

            redactionLog.getRedactionLogEntry().forEach(entry -> {
                duplicates.computeIfAbsent(entry.getId(), v -> new ArrayList<>()).add(entry);
@@ -592,7 +617,7 @@ public class RedactionIntegrationTest {
            });

            dictionary.get(AUTHOR).add("Drinking water");
-            when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(1L);
+            when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(1L);

            long rstart = System.currentTimeMillis();
            reanalyzeService.reanalyze(request);
@@ -628,16 +653,41 @@ public class RedactionIntegrationTest {


    @Test
-    public void redactionTest() throws IOException {
+    public void redactionExpansionOverlap() throws IOException {

-        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/ExpansionTest.pdf");
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

+
        AnalyzeResult result = reanalyzeService.analyze(request);

-        var redactionLog = redactionStorageService.getRedactionLog(TEST_PROJECT_ID, TEST_FILE_ID);
-        var text = redactionStorageService.getText(TEST_PROJECT_ID, TEST_FILE_ID);
+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        var values = redactionLog.getRedactionLogEntry().stream().map(RedactionLogEntry::getValue).collect(Collectors.toList());
+
+        assertThat(values).containsExactlyInAnyOrder("Lastname M.", "Doe", "Doe J.", "M. Mustermann", "Mustermann M.", "F. Lastname");
+    }
+
+
+    @Test
+    public void redactionTest() throws IOException {
+
+        long start = System.currentTimeMillis();
+        ClassPathResource pdfFileResource = new ClassPathResource("files/new/just-a-document-20211215.pdf");
+        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
+        request.setExcludedPages(Set.of(1));
+
+        request.setFileAttributes(List.of(FileAttribute.builder()
+                .id("fileAttributeId")
+                .label("Vertebrate Study")
+                .placeholder("{fileattributes.vertebrateStudy}")
+                .value("true")
+                .build()));
+
+        AnalyzeResult result = reanalyzeService.analyze(request);
+
+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+        var text = redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID);

        redactionLog.getRedactionLogEntry().forEach(entry -> {
            if (entry.isImage()) {
@@ -649,8 +699,8 @@ public class RedactionIntegrationTest {

        System.out.println("first analysis duration: " + (end - start));

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Test.json")) {
-            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_PROJECT_ID, TEST_FILE_ID)));
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Test.json")) {
+            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID)));
        }

        int correctFound = 0;
@@ -680,31 +730,122 @@ public class RedactionIntegrationTest {
        dictionary.get(AUTHOR).add("physical");
        reanlysisVersions.put("physical", 2L);

-        dictionary.get(VERTEBRATE).add("s-metolachlor");
-        reanlysisVersions.put("s-metolachlor", 3L);
+        deleted.add("David Chubb");

-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(3L);
+        dictionary.get(FALSE_POSITIVE).add("David Chubb");
+        reanlysisVersions.put("David Chubb", 3L);

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(3L);
+
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));

        start = System.currentTimeMillis();
+
+        ManualRedactions manualRedactions = new ManualRedactions();
+
+        manualRedactions.setImageRecategorizations(Set.of(ManualImageRecategorization.builder()
+                .id("37eee3e9d589a5cc529bfec38c3ba479")
+                .status(Status.APPROVED)
+                .type("signature")
+                .build()));
+
+        request.setManualRedactions(manualRedactions);
+
        AnalyzeResult reanalyzeResult = reanalyzeService.reanalyze(request);

+        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
        end = System.currentTimeMillis();
        System.out.println("reanalysis analysis duration: " + (end - start));

        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .projectId(TEST_PROJECT_ID)
+                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }

    }


+    @Test
+    public void testIgnoreHint() {
+
+        System.out.println("testIgnoreHint");
+
+        AnalyzeRequest request = prepareStorage("files/new/test-ignore-hint.pdf");
+        reanalyzeService.analyze(request);
+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        var manualRedactions = ManualRedactions.builder().idsToRemove(Sets.newLinkedHashSet(
+                IdRemoval.builder()
+                        .id("c630599611e6e3db314518374bcf70f7")
+                        .status(Status.APPROVED)
+                        .user("test")
+                        .removeFromDictionary(false)
+                        .processedDate(OffsetDateTime.now())
+                        .requestDate(OffsetDateTime.now())
+                        .build())).build();
+
+        request.setManualRedactions(manualRedactions);
+        reanalyzeService.reanalyze(request);
+
+
+        var mergedRedactionLog = redactionController.getRedactionLog(RedactionRequest.builder().withSectionDataForManualRedactions(true)
+                .manualRedactions(manualRedactions)
+                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .build());
+
+        var cbiAddressBeforeHintRemoval = redactionLog.getRedactionLogEntry().stream().filter(re -> re.getType().equalsIgnoreCase("CBI_Address")).findAny().get();
+        assertThat(cbiAddressBeforeHintRemoval.isRedacted()).isFalse();
+
+        var cbiAddressAfterHintRemoval = mergedRedactionLog.getRedactionLogEntry().stream().filter(re -> re.getType().equalsIgnoreCase("CBI_Address")).findAny().get();
+        assertThat(cbiAddressAfterHintRemoval.isRedacted()).isTrue();
+    }
+
+
+
+    @Test
+    public void testIgnoreHintFirstAnalysis() {
+
+        System.out.println("testIgnoreHintFirstAnalysis");
+
+        AnalyzeRequest request = prepareStorage("files/new/test-ignore-hint.pdf");
+
+        var manualRedactions = ManualRedactions.builder().idsToRemove(Sets.newLinkedHashSet(
+                IdRemoval.builder()
+                        .id("c630599611e6e3db314518374bcf70f7")
+                        .status(Status.APPROVED)
+                        .user("test")
+                        .removeFromDictionary(false)
+                        .processedDate(OffsetDateTime.now())
+                        .requestDate(OffsetDateTime.now())
+                        .build())).build();
+
+        request.setManualRedactions(manualRedactions);
+        reanalyzeService.analyze(request);
+
+        var mergedRedactionLog = redactionController.getRedactionLog(RedactionRequest.builder().withSectionDataForManualRedactions(true)
+                .manualRedactions(manualRedactions)
+                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .build());
+
+        var cbiAddressAfterHintRemoval = mergedRedactionLog.getRedactionLogEntry().stream().filter(re -> re.getType().equalsIgnoreCase("CBI_Address")).findAny().get();
+        assertThat(cbiAddressAfterHintRemoval.isRedacted()).isTrue();
+    }
+
+
+
    @Test
    public void testTableRedaction() throws IOException {

@@ -715,11 +856,34 @@ public class RedactionIntegrationTest {
        AnalyzeResult result = reanalyzeService.analyze(request);

        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .projectId(TEST_PROJECT_ID)
+                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+        System.out.println("numberOfPages: " + result.getNumberOfPages());
+    }
+
+
+    @Test
+    public void testIgnoreDossierRedactionIfConfidential() throws IOException {
+
+        long start = System.currentTimeMillis();
+
+        AnalyzeRequest request = prepareStorage("files/new/VV-919901.pdf");
+        AnalyzeResult result = reanalyzeService.analyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();
@@ -771,7 +935,6 @@ public class RedactionIntegrationTest {

 //        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);

-
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
        request.setManualRedactions(manualRedactions);
        AnalyzeResult result = reanalyzeService.analyze(request);
@@ -781,17 +944,22 @@ public class RedactionIntegrationTest {
                .id("5b940b2cb401ed9f5be6fc24f6e77bcf")
                .status(Status.APPROVED)
                .build()));
+        manualRedactions.setManualLegalBasisChanges(Set.of(ManualLegalBasisChange.builder()
+                .id("675eba69b0c2917de55462c817adaa05")
+                .legalBasis("Manual Legal Basis Change")
+                .status(Status.APPROVED)
+                .build()));

        reanalyzeService.reanalyze(request);

+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .projectId(TEST_PROJECT_ID)
+                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());

-
-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();
@@ -805,20 +973,19 @@ public class RedactionIntegrationTest {
    public void classificationTest() throws IOException {

        System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Trinexapac/93 Trinexapac-ethyl_RAR_03_Volume_3CA_B-1_2017-03-31.pdf");
-
+        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

        RedactionRequest redactionRequest = RedactionRequest.builder()
-                .projectId(request.getProjectId())
+                .dossierId(request.getDossierId())
                .fileId(request.getFileId())
-                .ruleSetId(request.getRuleSetId())
+                .dossierTemplateId(request.getDossierTemplateId())
                .build();

        RedactionResult result = redactionController.classify(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Classified.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Classified.pdf")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -833,14 +1000,14 @@ public class RedactionIntegrationTest {
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

        RedactionRequest redactionRequest = RedactionRequest.builder()
-                .projectId(request.getProjectId())
+                .dossierId(request.getDossierId())
                .fileId(request.getFileId())
-                .ruleSetId(request.getRuleSetId())
+                .dossierTemplateId(request.getDossierTemplateId())
                .build();

        RedactionResult result = redactionController.sections(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Sections.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Sections.pdf")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -855,14 +1022,14 @@ public class RedactionIntegrationTest {
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

        RedactionRequest redactionRequest = RedactionRequest.builder()
-                .projectId(request.getProjectId())
+                .dossierId(request.getDossierId())
                .fileId(request.getFileId())
-                .ruleSetId(request.getRuleSetId())
+                .dossierTemplateId(request.getDossierTemplateId())
                .build();

        RedactionResult result = redactionController.htmlTables(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Tables.html")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Tables.html")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -877,14 +1044,14 @@ public class RedactionIntegrationTest {
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

        RedactionRequest redactionRequest = RedactionRequest.builder()
-                .projectId(request.getProjectId())
+                .dossierId(request.getDossierId())
                .fileId(request.getFileId())
-                .ruleSetId(request.getRuleSetId())
+                .dossierTemplateId(request.getDossierTemplateId())
                .build();

        RedactionResult result = redactionController.htmlTables(redactionRequest);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Tables.html")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Tables.html")) {
            fileOutputStream.write(result.getDocument());
        }
    }
@@ -899,7 +1066,7 @@ public class RedactionIntegrationTest {

        AnalyzeResult result = reanalyzeService.analyze(request);

-        var redactionLog = redactionStorageService.getRedactionLog(TEST_PROJECT_ID, TEST_FILE_ID);
+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

        redactionLog.getRedactionLogEntry().forEach(entry -> {
            if (!entry.isHint()) {
@@ -908,8 +1075,10 @@ public class RedactionIntegrationTest {
        });
    }

+
    @SneakyThrows
    private AnalyzeRequest prepareStorage(String file) {
+
        ClassPathResource pdfFileResource = new ClassPathResource(file);

        return prepareStorage(pdfFileResource.getInputStream());
@@ -920,15 +1089,15 @@ public class RedactionIntegrationTest {
    private AnalyzeRequest prepareStorage(InputStream stream) {

        AnalyzeRequest request = AnalyzeRequest.builder()
-                .ruleSetId(TEST_RULESET_ID)
-                .projectId(TEST_PROJECT_ID)
+                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
+                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .lastProcessed(OffsetDateTime.now())
                .build();

        var bytes = IOUtils.toByteArray(stream);

-        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_PROJECT_ID, TEST_FILE_ID, FileType.ORIGIN), bytes);
+        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.ORIGIN), bytes);

        return request;

@@ -941,17 +1110,40 @@ public class RedactionIntegrationTest {
        long start = System.currentTimeMillis();
        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/sponsor_companies.pdf");

-
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

        AnalyzeResult result = reanalyzeService.analyze(request);

        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
-                .projectId(TEST_PROJECT_ID)
+                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+        System.out.println("numberOfPages: " + result.getNumberOfPages());
+    }
+
+
+    @Test
+    public void testExpandByRegEx() throws IOException {
+
+        System.out.println("expandByRegex");
+        long start = System.currentTimeMillis();
+
+        AnalyzeRequest request = prepareStorage("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
+        AnalyzeResult result = reanalyzeService.analyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();
@@ -979,4 +1171,13 @@ public class RedactionIntegrationTest {
        }
    }

+    private static String getTemporaryDirectory() {
+
+//        String tmpdir = System.getProperty("java.io.tmpdir");
+//        if (StringUtils.isNotBlank(tmpdir)) {
+//            return tmpdir;
+//        }
+        return "/tmp";
+    }
+
 }
@@ -82,7 +82,7 @@ public class EntityRedactionServiceTest {
    @MockBean
    private LegalBasisClient legalBasisClient;

-    private final static String TEST_RULESET_ID = "123";
+    private final static String TEST_DOSSIER_TEMPLATE_ID = "123";

    @Configuration
    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
@@ -138,20 +138,20 @@ public class EntityRedactionServiceTest {
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H.")))
                .build();
-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA")))
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);

        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);

        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
    }
@@ -165,19 +165,19 @@ public class EntityRedactionServiceTest {
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H.")))
                .build();
-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA")))
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);

        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
    }
@@ -188,21 +188,21 @@ public class EntityRedactionServiceTest {

        ClassPathResource pdfFileResource = new ClassPathResource("files/Cyprodinil/40 Cyprodinil - EU AIR3 - LCA Section 1" +
                " Supplement - Identity of the active substance - Reference list.pdf");
-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
                .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()
                .entrySet()
                .stream()
@@ -210,7 +210,7 @@ public class EntityRedactionServiceTest {
        pdfFileResource = new ClassPathResource("files/Compounds/27 A8637C - EU AIR3 - MCP Section 1 - Identity of " +
                "the plant protection product.pdf");
        classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()
                .entrySet()
                .stream()
@@ -221,21 +221,21 @@ public class EntityRedactionServiceTest {
    public void testFalsePositiveInWrongCell() throws IOException {

        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Row With Ambiguous Redaction.pdf");
-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
                .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))))
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1).stream()
                .filter(entity -> entity.getMatchedRule() == 9)
@@ -283,26 +283,26 @@ public class EntityRedactionServiceTest {
                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
                "       section.redactBetween(\"Contact:\", \"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
                "   end";
-        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(RULES_VERSION.incrementAndGet());
-        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(tableRules));
-        droolsExecutionService.updateRules(TEST_RULESET_ID);
+        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules(TEST_DOSSIER_TEMPLATE_ID);

        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Applicant Producer Table.pdf");
-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
                .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1).stream()
                .filter(entity -> entity.getMatchedRule() == 6)
@@ -322,26 +322,26 @@ public class EntityRedactionServiceTest {
                "Section(searchText.toLowerCase().contains(\"batches produced at\"))\n" + "    then\n" + "        section" +
                ".redactIfPrecededBy(\"batches produced at\", \"sponsor\", 11, \"Redacted because it represents a " +
                "sponsor company\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" + "    end";
-        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(RULES_VERSION.incrementAndGet());
-        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(tableRules));
-        droolsExecutionService.updateRules(TEST_RULESET_ID);
+        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules(TEST_DOSSIER_TEMPLATE_ID);

        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/batches_new_line.pdf");
-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
        DictionaryResponse authorResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(authorResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(authorResponse);
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))))
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1).stream()
                .filter(entity -> entity.getMatchedRule() == 11)
@@ -359,19 +359,19 @@ public class EntityRedactionServiceTest {
                .entries(toDictionaryEntry(Arrays.asList("Bissig R.", "Thanei P.")))
                .build();

-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);

        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(2); // two pages
        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(8);
        assertThat(classifiedDoc.getEntities().get(2).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(5); // 2 names, 1 address, 2 Y
@@ -382,15 +382,15 @@ public class EntityRedactionServiceTest {
                .entries(toDictionaryEntry(Arrays.asList("Tribolet, R.", "Muir, G.", "Kühne-Thu, H.", "Close, C.")))
                .build();

-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        addressResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);

        classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(3);
        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(9);
@@ -407,19 +407,19 @@ public class EntityRedactionServiceTest {
                .entries(toDictionaryEntry(Collections.singletonList("Aldershof S.")))
                .build();

-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);

        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(6);
    }
@@ -446,31 +446,31 @@ public class EntityRedactionServiceTest {
                "\"Yes\"))\n" +
                "    then\n" +
                "        section.redactCell(\"Author(s)\", 9,  \"name\", false, \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate study\", \"Reg (EC) No" +
+                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate sgitudy\", \"Reg (EC) No" +
                " 1107/2009 Art. 63 (2g)\");\n" +
                "        section.highlightCell(\"Vertebrate study Y/N\", 9, \"must_redact\");\n" +
                "    end";
-        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(RULES_VERSION.incrementAndGet());
-        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(tableRules));
+        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(new RulesResponse(tableRules));
        TypeResponse typeResponse = TypeResponse.builder()
                .types(Arrays.asList(
-                        TypeResult.builder().ruleSetId(TEST_RULESET_ID).type(AUTHOR_CODE).hexColor("#ffff00").build(),
-                        TypeResult.builder().ruleSetId(TEST_RULESET_ID).type(ADDRESS_CODE).hexColor("#ff00ff").build(),
-                        TypeResult.builder().ruleSetId(TEST_RULESET_ID).type(SPONSOR_CODE).hexColor("#00ffff").build()))
+                        TypeResult.builder().dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID).type(AUTHOR_CODE).hexColor("#ffff00").build(),
+                        TypeResult.builder().dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID).type(ADDRESS_CODE).hexColor("#ff00ff").build(),
+                        TypeResult.builder().dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID).type(SPONSOR_CODE).hexColor("#00ffff").build()))
                .build();
-        when(dictionaryClient.getVersion(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getAllTypes(TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(typeResponse);
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(typeResponse);

        // Default empty return to prevent NPEs
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
                .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);

        Colors colors = new Colors();
        colors.setDefaultColor("#acfc00");
@@ -478,7 +478,7 @@ public class EntityRedactionServiceTest {
        colors.setRequestAdd("#04b093");
        colors.setRequestRemove("#04b093");

-        when(dictionaryClient.getColors(TEST_RULESET_ID)).thenReturn(colors);
+        when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
    }


@@ -0,0 +1,171 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+
+public class EntitySearchUtilsTest {
+
+    /*
+     * Text:     Batman X. Superman Y.
+     * Position: 0123456789
+     *                     0123456789
+     *                               0123456789
+     */
+    @Test
+    public void testNotOverlappingEntitiesExpandedEnd() {
+
+        // Arrange
+        Set<Entity> existingEntities = new HashSet<>();
+        Entity existingEntity1 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false);
+        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false);
+        existingEntities.add(existingEntity1);
+        existingEntities.add(existingEntity2);
+
+        Set<Entity> foundEntities = new HashSet<>();
+        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false);
+        Entity foundEntities2 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false);
+        foundEntities.add(foundEntities1);
+        foundEntities.add(foundEntities2);
+
+        // Act
+        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
+
+        // Assert
+        assertThat(result.size()).isEqualTo(2);
+        assertThat(result).contains(foundEntities1);
+        assertThat(result).contains(foundEntities2);
+
+    }
+
+
+    /*
+     * Text:     Batman X. Superman Y.
+     * Position: 0123456789
+     *                     0123456789
+     *                               0123456789
+     */
+    @Test
+    public void testNotOverlappingEntitiesExpandedStartAndEndOverlapping() {
+
+        // Arrange
+        Set<Entity> existingEntities = new HashSet<>();
+        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false);
+        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false);
+        existingEntities.add(existingEntity1);
+        existingEntities.add(existingEntity2);
+
+        Set<Entity> foundEntities = new HashSet<>();
+        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false);
+        Entity foundEntities2 = new Entity("X. Superman Y.", "fake type", 7, 20, "fake headline", 0, false, false);
+        foundEntities.add(foundEntities1);
+        foundEntities.add(foundEntities2);
+
+        // Act
+        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
+
+        // Assert
+        assertThat(result.size()).isEqualTo(1);
+        assertThat(result).contains(foundEntities1);
+
+    }
+
+
+    /*
+     * Text:     Batman X. Superman Y.
+     * Position: 0123456789
+     *                     0123456789
+     *                               0123456789
+     */
+    @Test
+    public void testNotOverlappingEntitiesExpandedStartAndEnd() {
+
+        // Arrange
+        Set<Entity> existingEntities = new HashSet<>();
+        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false);
+        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false);
+        existingEntities.add(existingEntity1);
+        existingEntities.add(existingEntity2);
+
+        Set<Entity> foundEntities = new HashSet<>();
+        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false);
+        Entity foundEntities2 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false);
+        foundEntities.add(foundEntities1);
+        foundEntities.add(foundEntities2);
+
+        // Act
+        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
+
+        // Assert
+        assertThat(result.size()).isEqualTo(1);
+        assertThat(result).contains(foundEntities1);
+
+    }
+
+
+    /*
+     * Text:     Batman X. Superman Y.
+     * Position: 0123456789
+     *                     0123456789
+     *                               0123456789
+     */
+    @Test
+    public void testNotOverlappingEntitiesExpandedExistingAndExpandedEnd() {
+
+        // Arrange
+        Set<Entity> existingEntities = new HashSet<>();
+        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false);
+        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false);
+        existingEntities.add(existingEntity1);
+        existingEntities.add(existingEntity2);
+
+        Set<Entity> foundEntities = new HashSet<>();
+        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false);
+        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false);
+        foundEntities.add(foundEntities1);
+        foundEntities.add(foundEntities2);
+
+        // Act
+        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
+
+        // Assert
+        assertThat(result.size()).isEqualTo(0);
+
+    }
+
+    /*
+     * Text:     Batman X. Superman Y.
+     * Position: 0123456789
+     *                     0123456789
+     *                               0123456789
+     */
+    @Test
+    public void testNotOverlappingEntitiesExpandedEndLong() {
+
+        // Arrange
+        Set<Entity> existingEntities = new HashSet<>();
+        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false);
+        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false);
+        existingEntities.add(existingEntity1);
+        existingEntities.add(existingEntity2);
+
+        Set<Entity> foundEntities = new HashSet<>();
+        Entity foundEntities1 = new Entity("Batman X. Superman", "fake type", 0, 17, "fake headline", 0, false, false);
+        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false);
+        foundEntities.add(foundEntities1);
+        foundEntities.add(foundEntities2);
+
+        // Act
+        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
+
+        // Assert
+        assertThat(result.size()).isEqualTo(0);
+
+    }
+
+}
@@ -0,0 +1,80 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.redaction.v1.model.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.server.Application;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.SectionTextService;
+import lombok.SneakyThrows;
+import org.apache.commons.compress.utils.Lists;
+import org.assertj.core.util.Sets;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.MOCK)
+@Import(SectionTextServiceTest.TestConfiguration.class)
+public class SectionTextServiceTest {
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Autowired
+    private SectionTextService service;
+
+    @Autowired
+    private RedactionLogMergeService redactionLogMergeService;
+
+    @MockBean
+    private DictionaryService dictionaryService;
+
+    @MockBean
+    private AmazonS3 amazonS3;
+
+
+    @Configuration
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
+    public static class TestConfiguration {
+
+    }
+
+
+    @Test
+    @SneakyThrows
+    public void testMerge() {
+
+        when(dictionaryService.getColor(Mockito.anyString(), Mockito.anyString())).thenReturn(new float[]{0, 0, 0});
+
+        ManualRedactions manualRedactions = objectMapper.readValue(new ClassPathResource("contains/manual-redactions.json").getInputStream(), ManualRedactions.class);
+
+        RedactionLog redactionLog = new RedactionLog(1, Lists.newArrayList(), Lists.newArrayList(), 1, 1, 1, 1);
+        SectionGrid sectionGrid = objectMapper.readValue(new ClassPathResource("contains/sections.json").getInputStream(), SectionGrid.class);
+        RedactionLog merged = redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, "1", manualRedactions, Sets.newHashSet());
+
+        assertThat(merged.getRedactionLogEntry().isEmpty()).isFalse();
+
+        assertThat(merged.getRedactionLogEntry().iterator().next().getSection()).isEqualTo("NOTIFICATION OF AN ACTIVE\n" +
+                "SUBSTANCE UNDER COMMISSION\n" +
+                "REGULATION (EU) 844/2012");
+        assertThat(merged.getRedactionLogEntry().iterator().next().getSectionNumber()).isEqualTo(7);
+    }
+
+
+}
@@ -0,0 +1,54 @@
+{
+  "idsToRemove": [],
+  "entriesToAdd": [
+    {
+      "id": "d5fd9fd9690557703a22d8ab22832c7f",
+      "user": "7adf30b4-a0d8-4abb-adbb-760b1211098f",
+      "type": "manual",
+      "value": "DOCUMENT M-CA, Section 10\nSupplement",
+      "reason": "names and addresses of persons involved in testing on vertebrate animals",
+      "legalBasis": "[Reg (EC) No 1107/2009 Art. 63 (2g)]",
+      "section": null,
+      "positions": [
+        {
+          "topLeft": {
+            "x": 190.92,
+            "y": 376.7999
+          },
+          "width": 227.49368,
+          "height": 14.974969,
+          "page": 1
+        },
+        {
+          "topLeft": {
+            "x": 258.96,
+            "y": 358.31992
+          },
+          "width": 91.47408,
+          "height": 14.974969,
+          "page": 1
+        }
+      ],
+      "status": "APPROVED",
+      "addToDictionary": false,
+      "addToDossierDictionary": false,
+      "requestDate": "2021-11-03T15:01:45Z",
+      "processedDate": "2021-11-03T15:01:45Z",
+      "softDeletedTime": null
+    }
+  ],
+  "forceRedactions": [],
+  "imageRecategorization": [],
+  "legalBasisChanges": [],
+  "comments": {
+    "d5fd9fd9690557703a22d8ab22832c7f": [
+      {
+        "id": "56c1a675-0d64-4190-b76c-6af9d0b361a9",
+        "date": "2021-11-03T15:01:45Z",
+        "text": "test",
+        "user": "7adf30b4-a0d8-4abb-adbb-760b1211098f",
+        "softDeletedTime": null
+      }
+    ]
+  }
+}
@@ -0,0 +1,877 @@
+{
+  "rectanglesPerPage": {
+    "1": [
+      {
+        "topLeft": {
+          "x": 251.4,
+          "y": 550.32
+        },
+        "width": 107.763336,
+        "height": 12.02002,
+        "part": 1,
+        "numberOfParts": 1,
+        "tableCells": null
+      },
+      {
+        "topLeft": {
+          "x": 159.24,
+          "y": 280.92004
+        },
+        "width": 291.92004,
+        "height": 212.29996,
+        "part": 1,
+        "numberOfParts": 3,
+        "tableCells": null
+      }
+    ],
+    "2": [
+      {
+        "topLeft": {
+          "x": 70.92,
+          "y": 735.36
+        },
+        "width": 105.64288,
+        "height": 9.02002,
+        "part": 2,
+        "numberOfParts": 3,
+        "tableCells": null
+      },
+      {
+        "topLeft": {
+          "x": 65.56436,
+          "y": 719.9557
+        },
+        "width": 478.4686,
+        "height": -110.91278,
+        "part": 3,
+        "numberOfParts": 3,
+        "tableCells": [
+          {
+            "topLeft": {
+              "x": 65.56436,
+              "y": 684.47955
+            },
+            "width": 83.35573,
+            "height": 35.476135
+          },
+          {
+            "topLeft": {
+              "x": 148.92009,
+              "y": 684.47955
+            },
+            "width": 255.12016,
+            "height": 35.476135
+          },
+          {
+            "topLeft": {
+              "x": 404.04025,
+              "y": 684.47955
+            },
+            "width": 139.9927,
+            "height": 35.476135
+          },
+          {
+            "topLeft": {
+              "x": 65.56436,
+              "y": 659.27954
+            },
+            "width": 83.35573,
+            "height": 25.200012
+          },
+          {
+            "topLeft": {
+              "x": 148.92009,
+              "y": 659.27954
+            },
+            "width": 255.12016,
+            "height": 25.200012
+          },
+          {
+            "topLeft": {
+              "x": 404.04025,
+              "y": 659.27954
+            },
+            "width": 139.9927,
+            "height": 25.200012
+          },
+          {
+            "topLeft": {
+              "x": 65.56436,
+              "y": 634.20074
+            },
+            "width": 83.35573,
+            "height": 25.078796
+          },
+          {
+            "topLeft": {
+              "x": 148.92009,
+              "y": 634.20074
+            },
+            "width": 255.12016,
+            "height": 25.078796
+          },
+          {
+            "topLeft": {
+              "x": 404.04025,
+              "y": 634.20074
+            },
+            "width": 139.9927,
+            "height": 25.078796
+          },
+          {
+            "topLeft": {
+              "x": 65.56436,
+              "y": 609.0429
+            },
+            "width": 83.35573,
+            "height": 25.157837
+          },
+          {
+            "topLeft": {
+              "x": 148.92009,
+              "y": 609.0429
+            },
+            "width": 255.12016,
+            "height": 25.157837
+          },
+          {
+            "topLeft": {
+              "x": 404.04025,
+              "y": 609.0429
+            },
+            "width": 139.9927,
+            "height": 25.157837
+          }
+        ]
+      }
+    ],
+    "3": [
+      {
+        "topLeft": {
+          "x": 70.92,
+          "y": 691.2
+        },
+        "width": 468.76624,
+        "height": 53.179993,
+        "part": 1,
+        "numberOfParts": 3,
+        "tableCells": null
+      }
+    ],
+    "4": [
+      {
+        "topLeft": {
+          "x": 71.04,
+          "y": 555.48
+        },
+        "width": 461.24002,
+        "height": 188.78003,
+        "part": 2,
+        "numberOfParts": 3,
+        "tableCells": null
+      },
+      {
+        "topLeft": {
+          "x": 65.68587,
+          "y": 540.55756
+        },
+        "width": 478.58698,
+        "height": -365.55508,
+        "part": 3,
+        "numberOfParts": 3,
+        "tableCells": [
+          {
+            "topLeft": {
+              "x": 65.68587,
+              "y": 515.4003
+            },
+            "width": 125.808716,
+            "height": 25.157227
+          },
+          {
+            "topLeft": {
+              "x": 191.49458,
+              "y": 515.4003
+            },
+            "width": 352.77826,
+            "height": 25.157227
+          },
+          {
+            "topLeft": {
+              "x": 65.68587,
+              "y": 404.75992
+            },
+            "width": 125.808716,
+            "height": 110.64041
+          },
+          {
+            "topLeft": {
+              "x": 191.49458,
+              "y": 404.75992
+            },
+            "width": 352.77826,
+            "height": 110.64041
+          },
+          {
+            "topLeft": {
+              "x": 65.68587,
+              "y": 379.68002
+            },
+            "width": 125.808716,
+            "height": 25.079895
+          },
+          {
+            "topLeft": {
+              "x": 191.49458,
+              "y": 379.68002
+            },
+            "width": 352.77826,
+            "height": 25.079895
+          },
+          {
+            "topLeft": {
+              "x": 65.68587,
+              "y": 335.8798
+            },
+            "width": 125.808716,
+            "height": 43.800232
+          },
+          {
+            "topLeft": {
+              "x": 191.49458,
+              "y": 335.8798
+            },
+            "width": 352.77826,
+            "height": 43.800232
+          },
+          {
+            "topLeft": {
+              "x": 65.68587,
+              "y": 310.68
+            },
+            "width": 125.808716,
+            "height": 25.199799
+          },
+          {
+            "topLeft": {
+              "x": 191.49458,
+              "y": 310.68
+            },
+            "width": 352.77826,
+            "height": 25.199799
+          },
+          {
+            "topLeft": {
+              "x": 65.68587,
+              "y": 281.2798
+            },
+            "width": 125.808716,
+            "height": 29.400208
+          },
+          {
+            "topLeft": {
+              "x": 191.49458,
+              "y": 281.2798
+            },
+            "width": 352.77826,
+            "height": 29.400208
+          },
+          {
+            "topLeft": {
+              "x": 65.68587,
+              "y": 218.76001
+            },
+            "width": 125.808716,
+            "height": 62.519775
+          },
+          {
+            "topLeft": {
+              "x": 191.49458,
+              "y": 218.76001
+            },
+            "width": 352.77826,
+            "height": 62.519775
+          },
+          {
+            "topLeft": {
+              "x": 65.68587,
+              "y": 175.00247
+            },
+            "width": 125.808716,
+            "height": 43.757538
+          },
+          {
+            "topLeft": {
+              "x": 191.49458,
+              "y": 175.00247
+            },
+            "width": 352.77826,
+            "height": 43.757538
+          }
+        ]
+      }
+    ]
+  },
+  "sections": [
+    {
+      "sectionNumber": 1,
+      "headline": "",
+      "pages": [
+        1
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 251.4,
+            "y": 550.32
+          },
+          "width": 107.763336,
+          "height": 12.02002,
+          "page": 1,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 2,
+      "headline": "Table in: NOTIFICATION OF AN ACTIVE\nSUBSTANCE UNDER COMMISSION\nREGULATION (EU) 844/2012",
+      "pages": [
+        2
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 65.56436,
+            "y": 684.47955
+          },
+          "width": 83.35573,
+          "height": 35.476135,
+          "page": 2,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 148.92009,
+            "y": 684.47955
+          },
+          "width": 255.12016,
+          "height": 35.476135,
+          "page": 2,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 404.04025,
+            "y": 684.47955
+          },
+          "width": 139.9927,
+          "height": 35.476135,
+          "page": 2,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 3,
+      "headline": "Table in: NOTIFICATION OF AN ACTIVE\nSUBSTANCE UNDER COMMISSION\nREGULATION (EU) 844/2012",
+      "pages": [],
+      "sectionAreas": []
+    },
+    {
+      "sectionNumber": 4,
+      "headline": "Table in: NOTIFICATION OF AN ACTIVE\nSUBSTANCE UNDER COMMISSION\nREGULATION (EU) 844/2012",
+      "pages": [],
+      "sectionAreas": []
+    },
+    {
+      "sectionNumber": 5,
+      "headline": "Table in: NOTIFICATION OF AN ACTIVE\nSUBSTANCE UNDER COMMISSION\nREGULATION (EU) 844/2012",
+      "pages": [
+        2
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 65.56436,
+            "y": 609.0429
+          },
+          "width": 83.35573,
+          "height": 25.157837,
+          "page": 2,
+          "header": "Date"
+        }
+      ]
+    },
+    {
+      "sectionNumber": 7,
+      "headline": "NOTIFICATION OF AN ACTIVE\nSUBSTANCE UNDER COMMISSION\nREGULATION (EU) 844/2012",
+      "pages": [
+        1,
+        2
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 159.24,
+            "y": 280.92004
+          },
+          "width": 291.92004,
+          "height": 212.29996,
+          "page": 1,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 70.92,
+            "y": 735.36
+          },
+          "width": 105.64288,
+          "height": 9.02002,
+          "page": 2,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 8,
+      "headline": "Table in: Table of Contents",
+      "pages": [
+        4
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 65.68587,
+            "y": 515.4003
+          },
+          "width": 125.808716,
+          "height": 25.157227,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 191.49458,
+            "y": 515.4003
+          },
+          "width": 352.77826,
+          "height": 25.157227,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 65.68587,
+            "y": 404.75992
+          },
+          "width": 125.808716,
+          "height": 110.64041,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 65.68587,
+            "y": 379.68002
+          },
+          "width": 125.808716,
+          "height": 25.079895,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 191.49458,
+            "y": 379.68002
+          },
+          "width": 352.77826,
+          "height": 25.079895,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 65.68587,
+            "y": 335.8798
+          },
+          "width": 125.808716,
+          "height": 43.800232,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 191.49458,
+            "y": 335.8798
+          },
+          "width": 352.77826,
+          "height": 43.800232,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 65.68587,
+            "y": 310.68
+          },
+          "width": 125.808716,
+          "height": 25.199799,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 191.49458,
+            "y": 310.68
+          },
+          "width": 352.77826,
+          "height": 25.199799,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 65.68587,
+            "y": 281.2798
+          },
+          "width": 125.808716,
+          "height": 29.400208,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 191.49458,
+            "y": 281.2798
+          },
+          "width": 352.77826,
+          "height": 29.400208,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 65.68587,
+            "y": 218.76001
+          },
+          "width": 125.808716,
+          "height": 62.519775,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 191.49458,
+            "y": 218.76001
+          },
+          "width": 352.77826,
+          "height": 62.519775,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 65.68587,
+            "y": 175.00247
+          },
+          "width": 125.808716,
+          "height": 43.757538,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 191.49458,
+            "y": 175.00247
+          },
+          "width": 352.77826,
+          "height": 43.757538,
+          "page": 4,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 9,
+      "headline": "Table of Contents",
+      "pages": [
+        3,
+        4
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 70.92,
+            "y": 691.2
+          },
+          "width": 468.76624,
+          "height": 53.179993,
+          "page": 3,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 71.04,
+            "y": 555.48
+          },
+          "width": 461.24002,
+          "height": 188.78003,
+          "page": 4,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 10,
+      "headline": "Header",
+      "pages": [
+        1
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 70.92,
+            "y": 799.08
+          },
+          "width": 469.31543,
+          "height": 6.799988,
+          "page": 1,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 534.72,
+            "y": 783.84
+          },
+          "width": 5.470215,
+          "height": 6.0200195,
+          "page": 1,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 11,
+      "headline": "Header",
+      "pages": [
+        2
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 70.92,
+            "y": 799.08
+          },
+          "width": 469.31543,
+          "height": 6.799988,
+          "page": 2,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 534.72,
+            "y": 783.84
+          },
+          "width": 5.470215,
+          "height": 6.0200195,
+          "page": 2,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 12,
+      "headline": "Header",
+      "pages": [
+        3
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 70.92,
+            "y": 799.08
+          },
+          "width": 469.31543,
+          "height": 6.799988,
+          "page": 3,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 534.72,
+            "y": 783.84
+          },
+          "width": 5.470215,
+          "height": 6.0200195,
+          "page": 3,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 13,
+      "headline": "Header",
+      "pages": [
+        4
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 71.04,
+            "y": 798.96
+          },
+          "width": 469.70926,
+          "height": 6.799988,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 534.84,
+            "y": 783.72
+          },
+          "width": 5.488098,
+          "height": 6.036072,
+          "page": 4,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 14,
+      "headline": "Footer",
+      "pages": [
+        1
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 70.92,
+            "y": 37.080017
+          },
+          "width": 93.19173,
+          "height": 6.0200005,
+          "page": 1,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 468.0,
+            "y": 37.080017
+          },
+          "width": 71.701416,
+          "height": 6.0200005,
+          "page": 1,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 15,
+      "headline": "Footer",
+      "pages": [
+        2
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 70.92,
+            "y": 37.440002
+          },
+          "width": 93.19173,
+          "height": 6.0200005,
+          "page": 2,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 468.0,
+            "y": 37.440002
+          },
+          "width": 71.701416,
+          "height": 6.0200005,
+          "page": 2,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 16,
+      "headline": "Footer",
+      "pages": [
+        3
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 70.92,
+            "y": 37.440002
+          },
+          "width": 468.78143,
+          "height": 6.0200005,
+          "page": 3,
+          "header": null
+        }
+      ]
+    },
+    {
+      "sectionNumber": 17,
+      "headline": "Footer",
+      "pages": [
+        4
+      ],
+      "sectionAreas": [
+        {
+          "topLeft": {
+            "x": 71.04,
+            "y": 37.320007
+          },
+          "width": 93.3805,
+          "height": 6.0360794,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 468.12,
+            "y": 37.320007
+          },
+          "width": 71.984375,
+          "height": 6.0360794,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 71.04,
+            "y": 140.16003
+          },
+          "width": 254.69507,
+          "height": 7.5200043,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 71.04,
+            "y": 115.56
+          },
+          "width": 65.564415,
+          "height": 7.5199966,
+          "page": 4,
+          "header": null
+        },
+        {
+          "topLeft": {
+            "x": 71.04,
+            "y": 90.599976
+          },
+          "width": 424.84805,
+          "height": 7.5199966,
+          "page": 4,
+          "header": null
+        }
+      ]
+    }
+  ]
+}
@@ -1652,3 +1652,14 @@ Zoecon Corp.
 Zoecon Corp., Palo Alto, USA
 Zyma SA
 Zyma SA, Nyon, Switzerland
+Mambo-Tox Ltd. Biomedical Sciences Building Bassett Crescent East Southampton SO16 7PX UK
+Syngenta Environmental Sciences Jealott’s Hill International Research Centre Bracknell, Berkshire RG42 6EY UK
+Test Ignored Hint CBI_ADDRESS
+CTL
+CTL - Central Toxicology Laboratory
+CTL/P/3557
+CTL/P/3607
+CTL/P/S 161
+CTL/Pl4333
+CTL/with dictionary entry
+
@@ -1676,7 +1676,6 @@ da Silva Rejane
 Das R
 Das, R.
 Daughtry, CST
-David Chubb
 David Chubb|Lorraine Britton
 David Clarke
 Davies
@@ -8586,4 +8585,9 @@ Zoriki Hosomi R.
 Zoriki Hosomi Rosana
 Zuberer D
 Zubrod J
-Zwicker R.E.
+Zwicker R.E.
+Doe
+M. Mustermann
+F. Lastname
+Mustermann
+Lastname
@@ -0,0 +1,5 @@
+Amendment 1
+Report Number: 33168
+Page
+Report Number: BFI0714
+Tesh Consultants International
@@ -1 +1,2 @@
-Difenoconazole
+Difenoconazole
+FENPROPIDIN
@@ -235,4 +235,5 @@ N/A
 No details reported
 Not available
 Test facility
-TBD
+TBD
+David Chubb
@@ -85,3 +85,4 @@ Toxicology and Applied Pharmacology
 Toxicol Sci
 Toxicol Sci.
 Toxicol Sci. 1
+Test Ignored Hint Published Information
@@ -7,12 +7,20 @@ global Section section

 // --------------------------------------- CBI rules -------------------------------------------------------------------

+//rule "0: Expand CBI Authors with firstname initials"
+//    when
+//        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
+//    then
+//        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+//        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+//    end
+
 rule "0: Expand CBI Authors with firstname initials"
    when
        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
    then
-        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
+        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
    end


@@ -7,12 +7,20 @@ global Section section

 // --------------------------------------- CBI rules -------------------------------------------------------------------

+//rule "0: Expand CBI Authors with firstname initials"
+//    when
+//        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
+//    then
+//        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+//        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+//    end
+
 rule "0: Expand CBI Authors with firstname initials"
    when
        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
    then
-        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[\\s]+");
+        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[\\s]+");
    end


@@ -268,7 +276,7 @@ rule "18: Redact contact information if Producer is found"

 rule "19: Redact AUTHOR(S)"
    when
-        Section(searchText.contains("AUTHOR(S):"))
+        Section(searchText.contains("AUTHOR(S):") && fileAttributeByPlaceholderEquals("{fileattributes.vertebrateStudy}", "true"))
    then
        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 19, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end
@@ -336,4 +344,11 @@ rule "29: Redact Dossier Redactions"
         Section(matchesType("dossier_redactions"))
     then
         section.redact("dossier_redactions", 29, "Dossier Redaction found", "Article 39(1)(2) of Regulation (EC) No 178/2002");
-     end
+     end
+
+rule "30: Ignore dossier_redactions if confidential"
+    when
+        Section(!fileAttributeByLabelEqualsIgnoreCase("Confidentiality","confidential") && matchesType("dossier_redactions"));
+    then
+        section.ignore("dossier_redactions");
+    end