diff --git a/backend/src/main/java/com/nttdata/calender/changes/query/Filter.java b/backend/src/main/java/com/nttdata/calender/changes/query/Filter.java
index 3620ffe..90923fa 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/query/Filter.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/query/Filter.java
@@ -158,25 +158,30 @@ public class Filter {
                     }
 
                     for (int j = 0; j < criterias.length; j++) {
-                        String criteria = inner_criteria_prefix + criterias[j] + inner_criteria_prefix;
-                        String condition = "\"" + criterias[j] + "\")";
-                    
-                        if (criteria.contains("Completed")) {
-                            inner_qualifier += "(" + inner_filter + "\"Completed\" AND '1000000150' = "
-                                               + (criteria.contains("Completed (final review finished)") ? "9000)" : "10000)");
-                        } else if (criteria.contains("Rejected")) {
-                            inner_qualifier += "(" + inner_filter + "\"Rejected\" AND '301541700' = "
-                                               + (criteria.contains("Rejected (begin)") ? "1)" : "9)");
+
+                        criterias[j] = inner_criteria_prefix + criterias[j] + inner_criteria_prefix;
+
+                        if (criterias[j].contains("Completed") || criterias[j].contains("Rejected")) {
+                            if (criterias[j].contains("Completed")) {
+                                inner_qualifier += "(" + inner_filter + "\"Completed\" AND \'1000000150\' = "
+                                        + (criterias[j].equals("Completed (final review finished)") ? "9000)" : "10000)");
+                            } else {
+                                inner_qualifier += "(" + inner_filter + "\"Rejected\" AND \'301541700\' = "
+                                        + (criterias[j].equals("Rejected (begin)") ? "1)" : "9)");
+                            }
                         } else {
-                            inner_qualifier += "(" + inner_filter + condition;
+                            inner_qualifier += "(" + inner_filter + "\"" + criterias[j] + "\")";
                         }
-                    
+
+                        
                         if (j < criterias.length - 1) {
                             inner_qualifier += inner_concat;
                         }
+
                     }
-                    
                     qualifier += "(" + inner_qualifier + ")";
+
+                    System.out.println("QUALIFIER: " + qualifier);
                 }
             }
 
@@ -185,6 +190,8 @@ public class Filter {
             }
 
         }
+        System.out.println("\n" + qualifier + "\n");
+
         return qualifier;
     }