diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index da2d370fe..92babfcc6 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -51,10 +51,6 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-    staticParams: {
-        type: Array,
-        default: () => [],
-    },
     exprBuilder: {
         type: Function,
         default: null,
@@ -67,6 +63,10 @@ const props = defineProps({
         type: Function,
         default: undefined,
     },
+    searchRemoveParams: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const searchText = ref();
@@ -105,12 +105,18 @@ async function search() {
 
     const filter = {
         params: {
-            ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
-        ...{ filter: props.filter },
+        filter: props.filter,
     };
 
+    if (!props.searchRemoveParams || !searchText.value) {
+        filter.params = {
+            ...Object.fromEntries(staticParams),
+            search: searchText.value,
+        };
+    }
+
     if (props.whereFilter) {
         filter.filter = {
             where: props.whereFilter(searchText.value),
@@ -130,6 +136,7 @@ async function search() {
                 dense
                 standout
                 autofocus
+                data-cy="vnSearchBar"
             >
                 <template #prepend>
                     <QIcon
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 948970cc3..744f87297 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, onUnmounted, ref, computed, watch, provide, nextTick } from 'vue';
+import { onMounted, onUnmounted, ref, computed, watch, provide } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -101,6 +101,7 @@ provide('onItemSaved', onItemSaved);
         url="Orders/CatalogFilter"
         :label="t('Search items')"
         :info="t('You can search items by name or id')"
+        :search-remove-params="false"
     />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 650047e40..5c87faf99 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -163,7 +163,13 @@ onUnmounted(() => {
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
-    <VnSearchbar v-if="!showSearchBar" :data-key="datakey" :url="url" :redirect="false" />
+    <VnSearchbar
+        v-if="!showSearchBar"
+        :data-key="datakey"
+        :url="url"
+        :redirect="false"
+        :search-remove-params="false"
+    />
     <QTree
         ref="treeRef"
         :nodes="nodes"