diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 218e28600..3c1a4c8a5 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -60,7 +60,7 @@ const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
 const arrayData = useArrayData($props.dataKey, {
     exprBuilder: $props.exprBuilder,
     searchUrl: $props.searchUrl,
-    navigate: {},
+    navigate: $props.redirect ? {} : null,
 });
 const route = useRoute();
 const store = arrayData.store;
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 47591205a..f4cdde310 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -77,8 +77,8 @@ async function insert() {
         auto-load
         ref="vnPaginateRef"
         class="show"
-        :update-router="false"
         v-bind="$attrs"
+        search-url="notes"
     >
         <template #body="{ rows }">
             <TransitionGroup name="list" tag="div" class="column items-center full-width">
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 9764d2b23..9a2c06b0c 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -66,10 +66,6 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
-    updateRouter: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
@@ -124,7 +120,7 @@ async function fetch(params) {
     useArrayData(props.dataKey, params);
     store.filter.skip = 0;
     store.skip = 0;
-    await arrayData.fetch({ append: false, updateRouter: props.updateRouter });
+    await arrayData.fetch({ append: false });
     if (!store.hasMoreData) {
         isLoading.value = false;
     }
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 97422084b..fd5300122 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -219,6 +219,7 @@ const useLang = (values) => {
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups']"
         @remove="clearFilter"
+        :redirect="false"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 081a2cd2f..1d97663d0 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -70,7 +70,6 @@ function extractValueTags(items) {
                 :user-params="catalogParams"
                 auto-load
                 @on-fetch="extractTags"
-                :update-router="false"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 4f45689d0..dea720a61 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -45,7 +45,7 @@ const reportParams = computed(() => ({
 }));
 
 async function getSupplierConsumptionData() {
-    await arrayData.fetch({ append: false, updateRouter: false });
+    await arrayData.fetch({ append: false });
 }
 
 const rows = computed(() => {
@@ -166,10 +166,12 @@ onMounted(async () => {
             </div>
         </div>
     </Teleport>
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
-        <SupplierConsumptionFilter data-key="SupplierConsumption" />
-    </Teleport>
     <QPage class="column items-center q-pa-md">
+        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+            <QScrollArea class="fit text-grey-8">
+                <SupplierConsumptionFilter data-key="SupplierConsumption" />
+            </QScrollArea>
+        </QDrawer>
         <QTable
             :rows="rows"
             row-key="id"
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 781f8347a..3fc61b15e 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -50,7 +50,7 @@ const itemCategoriesOptions = ref([]);
         @on-fetch="(data) => (itemCategoriesOptions = data)"
         auto-load
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" :redirect="false">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>