diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java
index 7c6e652b..035ba970 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java
@@ -104,7 +104,11 @@ public class ComponentCreationService {
 
         referencedEntities.addAll(references);
 
-        kieSession.insert(Component.builder().matchedRule(RuleIdentifier.fromString(ruleIdentifier)).name(name).value(value).valueDescription(valueDescription)
+        kieSession.insert(Component.builder()
+                .matchedRule(RuleIdentifier.fromString(ruleIdentifier))
+                .name(name)
+                .value(value)
+                .valueDescription(valueDescription)
                 .references(new LinkedList<>(references))
                 .build());
     }
@@ -356,7 +360,9 @@ public class ComponentCreationService {
      */
     public void createComponentsForUnMappedEntities(String ruleIdentifier, Collection<Entity> entities) {
 
-        entities.stream().filter(entity -> !referencedEntities.contains(entity)).sorted(EntityComparators.first())
+        entities.stream()
+                .filter(entity -> !referencedEntities.contains(entity))
+                .sorted(EntityComparators.first())
                 .forEach(entity -> create(ruleIdentifier, entity.getType(), entity.getValue(), "Unmapped Entity", List.of(entity)));
     }
 
@@ -428,12 +434,16 @@ public class ComponentCreationService {
                     .entrySet()
                     .stream()
                     .sorted(Comparator.comparingInt(Map.Entry::getKey))
-                    .map(Map.Entry::getValue)
-                    .forEach(entitiesInSameRow -> create(ruleIdentifier,
-                            name,
-                            entitiesInSameRow.stream().sorted(EntityComparators.first()).map(Entity::getValue).collect(Collectors.joining(", ")),
-                            valueDescription,
-                            entitiesInSameRow));
+//                    .map(Map.Entry::getValue)
+                    .forEach(integerListEntry -> {
+                        var rowNumber = integerListEntry.getKey();
+                        var entitiesInSameRow = integerListEntry.getValue();
+                        create(ruleIdentifier,
+                                name + rowNumber,
+                                entitiesInSameRow.stream().sorted(EntityComparators.first()).map(Entity::getValue).collect(Collectors.joining(", ")),
+                                valueDescription,
+                                entitiesInSameRow);
+                    });
         });
     }
 
@@ -476,7 +486,9 @@ public class ComponentCreationService {
      */
     public void create(String ruleIdentifier, String name, String value) {
 
-        kieSession.insert(Component.builder().matchedRule(RuleIdentifier.fromString(ruleIdentifier)).name(name)
+        kieSession.insert(Component.builder()
+                .matchedRule(RuleIdentifier.fromString(ruleIdentifier))
+                .name(name)
                 .value(value)
                 .valueDescription("")
                 .references(Collections.emptyList())