diff --git a/resources/assets/js/components/search/AdvancedFilter.vue b/resources/assets/js/components/search/AdvancedFilter.vue
index 10f4ae45f..39efd125f 100644
--- a/resources/assets/js/components/search/AdvancedFilter.vue
+++ b/resources/assets/js/components/search/AdvancedFilter.vue
@@ -230,7 +230,7 @@ export default {
                     tagPrefix: this.$i18n.t('ID_SEARCH_BY_CASE_NUMBER'),
                     items:[
                         {
-                            id: "filterCases",
+                            id: "caseNumber",
                             value: ""
                         }
                     ],
diff --git a/resources/assets/js/components/search/CasesFilter.vue b/resources/assets/js/components/search/CasesFilter.vue
index f02dfc69a..b54b89a34 100644
--- a/resources/assets/js/components/search/CasesFilter.vue
+++ b/resources/assets/js/components/search/CasesFilter.vue
@@ -117,7 +117,7 @@ export default {
             tagPrefix: this.$i18n.t("ID_SEARCH_BY_CASE_NUMBER"),
             items: [
                 {
-                id: "filterCases",
+                id: "caseNumber",
                 value: "",
                 },
             ],
@@ -214,7 +214,10 @@ export default {
         handler(newVal, oldVal) { 
             this.searchTags = [];
             this.selected = [];
-            this.setFilters(newVal);
+            if (newVal.length) {
+                this.setFilters(newVal, oldVal);
+                this.searchClickHandler();
+            }
         }
     }
   },
@@ -272,17 +275,20 @@ export default {
      * Set Filters and make the tag labels
      * @param {object} filters json to manage the query
      */
-    setFilters(filters) {
+    setFilters(filters, oldVal) {
       let self = this;
       _.forEach(filters, function (item, key) {
         let component = _.find(self.filterItems, function (o) {
           return o.id === item.fieldId;
         });
         if (component) {
-          self.searchTags.push(component.id);
-          self.selected = component.id;
-          self.itemModel[component.id] = component;
-          self.itemModel[component.id].autoShow = typeof item.autoShow !== "undefined" ? item.autoShow : true
+            self.searchTags.push(component.id);
+            self.selected.push(component.id);
+            self.itemModel[component.id] = component;
+            self.itemModel[component.id].autoShow = typeof item.autoShow !== "undefined" ? item.autoShow : true;
+            if (!oldVal.length) {
+                self.updateSearchTag(item);
+            }
         }
         if(item.fieldId === "processName") {
             self.searchTags.push(self.processName.id);
diff --git a/resources/assets/js/components/search/MyCasesFilter.vue b/resources/assets/js/components/search/MyCasesFilter.vue
index 7ed9aac64..9c30d372d 100644
--- a/resources/assets/js/components/search/MyCasesFilter.vue
+++ b/resources/assets/js/components/search/MyCasesFilter.vue
@@ -113,7 +113,7 @@ export default {
                     tagPrefix:  this.$i18n.t('ID_SEARCH_BY_CASE_NUMBER'),
                     items:[
                         {
-                            id: "filterCases",
+                            id: "caseNumber",
                             value: ""
                         }
                     ],