diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
index 382c4e64..4851516a 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
@@ -108,6 +108,12 @@ public class Section {
                 lastEnd = -1;
                 numberOfMatchParts = 0;
                 foundParts = new HashSet<>();
+                if(entity.getType().equals(startType)){
+                    lastEnd = entity.getEnd();
+                    start = entity.getStart();
+                    foundParts.add(entity.getType());
+                    numberOfMatchParts++;
+                }
             } else if(entity.getType().equals(startType) && start != -1){
                 if(numberOfMatchParts >= minPartMatches) {
                     String value = searchText.substring(start, lastEnd);
@@ -117,6 +123,8 @@ public class Section {
                 lastEnd = entity.getEnd();
                 numberOfMatchParts = 0;
                 foundParts = new HashSet<>();
+                foundParts.add(entity.getType());
+                numberOfMatchParts++;
             } else if(start != -1 && combineSet.contains(entity.getType()) && entity.getStart() - lastEnd < maxDistanceBetween){
                 lastEnd = entity.getEnd();
                 numberOfMatchParts++;