diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl
index 257c0441..57941be0 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl
@@ -991,13 +991,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -1005,7 +1005,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl
index a3205ab4..f4c5234f 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl
@@ -1561,13 +1561,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -1575,7 +1575,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl
index 9d6e9c9b..a2c14670 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl
@@ -1392,13 +1392,13 @@ rule "X.7.0: Remove all images"
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -1406,7 +1406,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl
index f3af91ad..900264bc 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl
@@ -233,13 +233,13 @@ rule "X.5.1: Remove Entity of type RECOMMENDATION when contained by RECOMMENDATI
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -247,7 +247,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl
index 13655872..f7ea3974 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl
@@ -1151,13 +1151,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -1165,7 +1165,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl
index 65f097b8..7c93954f 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl
@@ -357,13 +357,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -371,7 +371,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl
index e5f2ef32..0458ff2c 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl
@@ -478,13 +478,13 @@ rule "X.7.0: Remove all images"
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -492,7 +492,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl
index 3e9b25f5..6e4dfc49 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl
@@ -394,13 +394,13 @@ rule "X.7.0: Remove all images"
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -408,7 +408,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
diff --git a/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl b/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl
index e931b9e0..4232aba8 100644
--- a/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl
+++ b/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl
@@ -1585,13 +1585,13 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -1599,7 +1599,7 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
diff --git a/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl b/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl
index ffe81c37..edd5d731 100644
--- a/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl
+++ b/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl
@@ -1540,13 +1540,13 @@ rule "X.7.0: Remove all images"
 
 
 // Rule unit: X.8
-rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
+rule "X.8.0: Remove Entity when text range and type equals to imported Entity"
     salience 257
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
-        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, engines not contains Engine.IMPORTED)
+        $entity: TextEntity($type: type(), engines contains Engine.IMPORTED, active())
+        $other: TextEntity(getTextRange().equals($entity.getTextRange()), this != $entity, type() == $type, engines not contains Engine.IMPORTED)
     then
-        $other.remove("X.8.0", "remove Entity when equal to imported Entity");
+        $other.remove("X.8.0", "remove Entity when text range and type equals to imported Entity");
         $entity.addEngines($other.getEngines());
         retract($other);
     end
@@ -1554,13 +1554,14 @@ rule "X.8.0: Remove Entity when textRange is equal to imported Entity"
 rule "X.8.1: Remove Entity when intersected by imported Entity"
     salience 256
     when
-        $entity: TextEntity($type: type, engines contains Engine.IMPORTED, active())
+        $entity: TextEntity(engines contains Engine.IMPORTED, active())
         $other: TextEntity(intersects($entity), this != $entity, engines not contains Engine.IMPORTED)
     then
         $other.remove("X.8.1", "remove Entity when intersected by imported Entity");
         retract($other);
     end
 
+
 //------------------------------------ File attributes rules ------------------------------------
 
 // Rule unit: FA.1