diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl
index 089733c6..b1093887 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl
@@ -16,6 +16,9 @@ import com.iqser.red.service.redaction.v1.server.logger.RulesLogger;
 
 import com.iqser.red.service.redaction.v1.server.model.component.Component;
 import com.iqser.red.service.redaction.v1.server.model.component.Entity;
+import com.iqser.red.service.redaction.v1.server.model.component.Queryable;
+import com.iqser.red.service.redaction.v1.server.model.component.ComponentMapping;
+import com.iqser.red.service.redaction.v1.server.model.component.ComponentMapping.Query;
 import com.iqser.red.service.redaction.v1.server.service.components.ComponentMappingService;
 import com.iqser.red.service.redaction.v1.server.service.document.ComponentCreationService;
 
@@ -30,7 +33,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribu
 
 global ComponentCreationService componentCreationService
 
-
 /**
 The imports, globals, queries and rules from this file are required for any component rule file.
 Since customers may edit their rules we need to ensure they can't change the imports to prevent malicious code execution!
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/components/mappings/MappingQueryTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/components/mappings/MappingQueryTest.java
index 82d446f9..01f55c29 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/components/mappings/MappingQueryTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/components/mappings/MappingQueryTest.java
@@ -58,6 +58,10 @@ public class MappingQueryTest {
                 .toList();
 
         assertEquals(2, queryResultList.size());
+
+        assertEquals(2,
+                     mapping.where("number = 404").where("year matches 20\\\\d{2}").select("description")
+                             .count());
     }