diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/CustomEntityCreationAdapter.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/CustomEntityCreationAdapter.java
index 3475bcf2..03f94a0f 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/CustomEntityCreationAdapter.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/CustomEntityCreationAdapter.java
@@ -57,7 +57,10 @@ public class CustomEntityCreationAdapter {
 
     public List<RedactionEntity> createRedactionEntities(Set<ManualRedactionEntry> manualRedactionEntries, SemanticNode node) {
 
-        List<EntityIdentifier> entityIdentifiers = manualRedactionEntries.stream().map(EntityIdentifier::fromManualRedactionEntry).toList();
+        List<EntityIdentifier> entityIdentifiers = manualRedactionEntries.stream()
+                .filter(manualRedactionEntry -> !manualRedactionEntry.isAddToDictionary() || !manualRedactionEntry.isAddToDossierDictionary())
+                .map(EntityIdentifier::fromManualRedactionEntry)
+                .toList();
         return toRedactionEntity(entityIdentifiers, node);
     }
 
@@ -141,9 +144,10 @@ public class CustomEntityCreationAdapter {
     private Map<String, List<RedactionEntity>> findAllPossibleEntitiesAndGroupByValue(SemanticNode node, Set<Integer> pageNumbers, Set<String> entryValues) {
 
         if (!pageNumbers.stream().allMatch(node::isOnPage)) {
-            throw new IllegalArgumentException(format("SemanticNode %s does not contain these pages %s present in the redaction log",
+            throw new IllegalArgumentException(format("SemanticNode \"%s\" does not contain these pages %s, it has pages: %s",
                     node,
-                    pageNumbers.stream().filter(pageNumber -> !node.isOnPage(pageNumber)).toList()));
+                    pageNumbers.stream().filter(pageNumber -> !node.isOnPage(pageNumber)).toList(),
+                    node.getPages()));
         }
         SearchImplementation searchImplementation = new SearchImplementation(entryValues, true);