diff --git a/test/vitest/__tests__/boot/axios.spec.js b/src/boot/__tests__/axios.spec.js
similarity index 100%
rename from test/vitest/__tests__/boot/axios.spec.js
rename to src/boot/__tests__/axios.spec.js
diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 31ad9ebed..7a882e56c 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -92,13 +92,13 @@ function findMatches(search, item) {
 }
 
 function addChildren(module, route, parent) {
-    if (route.menus) {
-        const mainMenus = route.menus[props.source];
-        const matches = findMatches(mainMenus, route);
+    const menus = route?.meta?.menu ?? route?.menus?.[props.source]; //backwards compatible
+    if (!menus) return;
 
-        for (const child of matches) {
-            navigation.addMenuItem(module, child, parent);
-        }
+    const matches = findMatches(menus, route);
+
+    for (const child of matches) {
+        navigation.addMenuItem(module, child, parent);
     }
 }
 
@@ -122,16 +122,26 @@ function getRoutes() {
     if (props.source === 'card') {
         const currentRoute = route.matched[1];
         const currentModule = toLowerCamel(currentRoute.name);
-        const moduleDef = routes.find(
+        let moduleDef = routes.find(
             (route) => toLowerCamel(route.name) === currentModule
         );
 
         if (!moduleDef) return;
-
+        if (!moduleDef?.menus) moduleDef = betaGetRoutes();
         addChildren(currentModule, moduleDef, items.value);
     }
 }
 
+function betaGetRoutes() {
+    let menuRoute;
+    let index = route.matched.length - 1;
+    while (!menuRoute && index > 0) {
+        if (route.matched[index]?.meta?.menu) menuRoute = route.matched[index];
+        index--;
+    }
+    return menuRoute;
+}
+
 async function togglePinned(item, event) {
     if (event.defaultPrevented) return;
     event.preventDefault();
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index b2816975c..ef5bdc6ac 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -57,6 +57,7 @@ onMounted(() => stateStore.setMounted());
                     'no-visible': !stateQuery.isLoading().value,
                 }"
                 size="xs"
+                data-cy="loading-spinner"
             />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 999133130..426f5c716 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -32,7 +32,10 @@ const $props = defineProps({
 defineExpose({ addFilter, props: $props });
 
 const model = defineModel(undefined, { required: true });
-const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
+const arrayData = useArrayData(
+    $props.dataKey,
+    $props.searchUrl ? { searchUrl: $props.searchUrl } : null
+);
 const columnFilter = computed(() => $props.column?.columnFilter);
 
 const updateEvent = { 'update:modelValue': addFilter };
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index f09bed8ba..7886d0567 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -1,20 +1,21 @@
 <script setup>
-import { ref, onBeforeMount, onMounted, computed, watch } from 'vue';
+import { ref, onBeforeMount, onMounted, computed, watch, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
+import { useFilterParams } from 'src/composables/useFilterParams';
 
 import CrudModel from 'src/components/CrudModel.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
+import VnTableFilter from './VnTableFilter.vue';
 
 const $props = defineProps({
     columns: {
@@ -33,6 +34,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    rightSearchIcon: {
+        type: Boolean,
+        default: true,
+    },
     rowClick: {
         type: [Function, Boolean],
         default: null,
@@ -101,10 +106,6 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
-    chipLocale: {
-        type: String,
-        default: null,
-    },
     footer: {
         type: Boolean,
         default: false,
@@ -119,22 +120,21 @@ const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
 const quasar = useQuasar();
+const $attrs = useAttrs();
 
 const CARD_MODE = 'card';
 const TABLE_MODE = 'table';
 const mode = ref(CARD_MODE);
 const selected = ref([]);
 const hasParams = ref(false);
-const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
-const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
-const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
-const tableFilterRef = ref([]);
 const tableRef = ref();
+const params = ref(useFilterParams($attrs['data-key']).params);
+const orders = ref(useFilterParams($attrs['data-key']).orders);
 
 const tableModes = [
     {
@@ -184,41 +184,8 @@ watch(
     { immediate: true }
 );
 
-watch(
-    () => route.query[$props.searchUrl],
-    (val) => setUserParams(val),
-    { immediate: true, deep: true }
-);
-
 const isTableMode = computed(() => mode.value == TABLE_MODE);
-
-function setUserParams(watchedParams, watchedOrder) {
-    if (!watchedParams) return;
-
-    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
-    const filter =
-        typeof watchedParams?.filter == 'string'
-            ? JSON.parse(watchedParams?.filter ?? '{}')
-            : watchedParams?.filter;
-    const where = filter?.where;
-    const order = watchedOrder ?? filter?.order;
-
-    watchedParams = { ...watchedParams, ...where };
-    delete watchedParams.filter;
-    delete params.value?.filter;
-    params.value = { ...params.value, ...sanitizer(watchedParams) };
-    orders.value = parseOrder(order);
-}
-
-function sanitizer(params) {
-    for (const [key, value] of Object.entries(params)) {
-        if (value && typeof value == 'object') {
-            const param = Object.values(value)[0];
-            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
-        }
-    }
-    return params;
-}
+const showRightIcon = computed(() => $props.rightSearch || $props.rightSearchIcon);
 
 function splitColumns(columns) {
     splittedColumns.value = {
@@ -299,17 +266,6 @@ function getColAlign(col) {
     return 'text-' + (col.align ?? 'left');
 }
 
-function parseOrder(urlOrders) {
-    const orderObject = {};
-    if (!urlOrders) return orderObject;
-    if (typeof urlOrders == 'string') urlOrders = [urlOrders];
-    for (const [index, orders] of urlOrders.entries()) {
-        const [name, direction] = orders.split(' ');
-        orderObject[name] = { direction, index: index + 1 };
-    }
-    return orderObject;
-}
-
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
     create: createForm,
@@ -358,61 +314,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <VnFilterPanel
-                :data-key="$attrs['data-key']"
-                :search-button="true"
-                v-model="params"
-                :search-url="searchUrl"
-                :redirect="!!redirect"
-                @set-user-params="setUserParams"
-                :disable-submit-event="true"
-                @remove="
-                    (key) =>
-                        tableFilterRef
-                            .find((f) => f.props?.column.name == key)
-                            ?.addFilter()
-                "
-            >
-                <template #body>
-                    <div
-                        class="row no-wrap flex-center"
-                        v-for="col of splittedColumns.columns.filter(
-                            (c) => c.columnFilter ?? true
-                        )"
-                        :key="col.id"
-                    >
-                        <VnFilter
-                            ref="tableFilterRef"
-                            :column="col"
-                            :data-key="$attrs['data-key']"
-                            v-model="params[columnName(col)]"
-                            :search-url="searchUrl"
-                        />
-                        <VnTableOrder
-                            v-if="
-                                col?.columnFilter !== false &&
-                                col?.name !== 'tableActions'
-                            "
-                            v-model="orders[col.orderBy ?? col.name]"
-                            :name="col.orderBy ?? col.name"
-                            :data-key="$attrs['data-key']"
-                            :search-url="searchUrl"
-                            :vertical="false"
-                        />
-                    </div>
-                    <slot
-                        name="moreFilterPanel"
-                        :params="params"
-                        :columns="splittedColumns.columns"
-                    />
-                </template>
-                <template #tags="{ tag, formatFn }" v-if="chipLocale">
-                    <div class="q-gutter-x-xs">
-                        <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
-                        <span>{{ formatFn(tag.value) }}</span>
-                    </div>
-                </template>
-            </VnFilterPanel>
+            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" />
         </QScrollArea>
     </QDrawer>
     <CrudModel
@@ -468,7 +370,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                         :options="tableModes.filter((mode) => !mode.disable)"
                     />
                     <QBtn
-                        v-if="$props.rightSearch"
+                        v-if="showRightIcon"
                         icon="filter_alt"
                         class="bg-vn-section-color q-ml-sm"
                         dense
diff --git a/src/components/VnTable/VnTableFilter.vue b/src/components/VnTable/VnTableFilter.vue
new file mode 100644
index 000000000..f23c657cf
--- /dev/null
+++ b/src/components/VnTable/VnTableFilter.vue
@@ -0,0 +1,72 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
+import VnFilter from 'components/VnTable/VnFilter.vue';
+import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
+
+defineProps({
+    columns: {
+        type: Array,
+        required: true,
+    },
+    chipLocale: {
+        type: String,
+        default: null,
+    },
+    searchUrl: {
+        type: [String, Boolean],
+        default: 'table',
+    },
+});
+const { t } = useI18n();
+
+const tableFilterRef = ref([]);
+
+function columnName(col) {
+    const column = { ...col, ...col.columnFilter };
+    let name = column.name;
+    if (column.alias) name = column.alias + '.' + name;
+    return name;
+}
+</script>
+<template>
+    <VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
+        <template #body="{ params, orders }">
+            <div
+                class="row no-wrap flex-center"
+                v-for="col of columns.filter((c) => c.columnFilter ?? true)"
+                :key="col.id"
+            >
+                <VnFilter
+                    ref="tableFilterRef"
+                    :column="col"
+                    :data-key="$attrs['data-key']"
+                    v-model="params[columnName(col)]"
+                    :search-url="searchUrl"
+                />
+                <VnTableOrder
+                    v-if="col?.columnFilter !== false && col?.name !== 'tableActions'"
+                    v-model="orders[col.orderBy ?? col.name]"
+                    :name="col.orderBy ?? col.name"
+                    :data-key="$attrs['data-key']"
+                    :search-url="searchUrl"
+                    :vertical="true"
+                />
+            </div>
+            <slot
+                name="moreFilterPanel"
+                :params="params"
+                :orders="orders"
+                :columns="columns"
+            />
+        </template>
+        <template #tags="{ tag, formatFn }" v-if="chipLocale">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+    </VnFilterPanel>
+</template>
diff --git a/test/vitest/__tests__/components/VnTable.spec.js b/src/components/VnTable/__tests__/VnTable.spec.js
similarity index 82%
rename from test/vitest/__tests__/components/VnTable.spec.js
rename to src/components/VnTable/__tests__/VnTable.spec.js
index 162df727d..74ba06987 100644
--- a/test/vitest/__tests__/components/VnTable.spec.js
+++ b/src/components/VnTable/__tests__/VnTable.spec.js
@@ -1,4 +1,4 @@
-import { describe, expect, it, beforeAll, beforeEach } from 'vitest';
+import { describe, expect, it, beforeAll, beforeEach, vi } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
@@ -13,6 +13,15 @@ describe('VnTable', () => {
             },
         });
         vm = wrapper.vm;
+
+        vi.mock('src/composables/useFilterParams', () => {
+            return {
+                useFilterParams: vi.fn(() => ({
+                    params: {},
+                    orders: {},
+                })),
+            };
+        });
     });
 
     beforeEach(() => (vm.selected = []));
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/src/components/__tests__/CrudModel.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/CrudModel.spec.js
rename to src/components/__tests__/CrudModel.spec.js
diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/src/components/__tests__/Leftmenu.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/Leftmenu.spec.js
rename to src/components/__tests__/Leftmenu.spec.js
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 02226e497..334ab4d21 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -15,7 +15,7 @@ let root = ref(null);
 
 watchEffect(() => {
     matched.value = currentRoute.value.matched.filter(
-        (matched) => Object.keys(matched.meta).length
+        (matched) => !!matched?.meta?.title || !!matched?.meta?.icon
     );
     breadcrumbs.value.length = 0;
     if (!matched.value[0]) return;
diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
new file mode 100644
index 000000000..349956be9
--- /dev/null
+++ b/src/components/common/VnCardBeta.vue
@@ -0,0 +1,67 @@
+<script setup>
+import { onBeforeMount, computed } from 'vue';
+import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import useCardSize from 'src/composables/useCardSize';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from '../ui/VnSubToolbar.vue';
+
+const props = defineProps({
+    dataKey: { type: String, required: true },
+    baseUrl: { type: String, default: undefined },
+    customUrl: { type: String, default: undefined },
+    filter: { type: Object, default: () => {} },
+    descriptor: { type: Object, required: true },
+    filterPanel: { type: Object, default: undefined },
+    searchDataKey: { type: String, default: undefined },
+    searchbarProps: { type: Object, default: undefined },
+    redirectOnError: { type: Boolean, default: false },
+});
+
+const stateStore = useStateStore();
+const route = useRoute();
+const router = useRouter();
+const url = computed(() => {
+    if (props.baseUrl) {
+        return `${props.baseUrl}/${route.params.id}`;
+    }
+    return props.customUrl;
+});
+
+const arrayData = useArrayData(props.dataKey, {
+    url: url.value,
+    filter: props.filter,
+});
+
+onBeforeMount(async () => {
+    try {
+        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        await arrayData.fetch({ append: false, updateRouter: false });
+    } catch {
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+        router.push({ path: path.replace(/:id.*/, '') });
+    }
+});
+
+if (props.baseUrl) {
+    onBeforeRouteUpdate(async (to, from) => {
+        if (to.params.id !== from.params.id) {
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
+            await arrayData.fetch({ append: false, updateRouter: false });
+        }
+    });
+}
+</script>
+<template>
+    <Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
+        <component :is="descriptor" />
+        <QSeparator />
+        <LeftMenu source="card" />
+    </Teleport>
+    <VnSubToolbar />
+    <div :class="[useCardSize(), $attrs.class]">
+        <RouterView :key="route.path" />
+    </div>
+</template>
diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnModule.vue
similarity index 52%
rename from src/components/common/VnSectionMain.vue
rename to src/components/common/VnModule.vue
index 15be6ad9a..505b3a8b5 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnModule.vue
@@ -1,8 +1,8 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
-import { onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useQuasar } from 'quasar';
+import LeftMenu from '../LeftMenu.vue';
 
 const stateStore = useStateStore();
 const $props = defineProps({
@@ -14,12 +14,30 @@ const $props = defineProps({
 onMounted(
     () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
 );
+
+const teleportRef = ref({});
+const hasContent = ref();
+let observer;
+
+onMounted(() => {
+    if (teleportRef.value) {
+        const checkContent = () => {
+            hasContent.value = teleportRef.value.innerHTML.trim() !== '';
+        };
+
+        observer = new MutationObserver(checkContent);
+        observer.observe(teleportRef.value, { childList: true, subtree: true });
+
+        checkContent();
+    }
+});
 </script>
 
 <template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
+            <div id="left-panel" ref="teleportRef"></div>
+            <LeftMenu v-if="!hasContent" />
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
new file mode 100644
index 000000000..e69e586b5
--- /dev/null
+++ b/src/components/common/VnSection.vue
@@ -0,0 +1,79 @@
+<script setup>
+import RightMenu from './RightMenu.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnTableFilter from '../VnTable/VnTableFilter.vue';
+import { onBeforeMount, computed } from 'vue';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const $props = defineProps({
+    section: {
+        type: String,
+        required: true,
+    },
+    dataKey: {
+        type: String,
+        default: null,
+    },
+    searchBar: {
+        type: Boolean,
+        default: true,
+    },
+    prefix: {
+        type: String,
+        default: null,
+    },
+    rightFilter: {
+        type: Boolean,
+        default: true,
+    },
+    columns: {
+        type: Array,
+        default: null,
+    },
+    arrayDataProps: {
+        type: Object,
+        default: null,
+    },
+    redirect: {
+        type: Boolean,
+        default: true,
+    },
+});
+
+const sectionValue = computed(() => $props.section ?? $props.dataKey);
+let arrayData;
+onBeforeMount(() => {
+    if ($props.dataKey)
+        arrayData = useArrayData($props.dataKey, {
+            searchUrl: 'table',
+            ...$props.arrayDataProps,
+            navigate: $props.redirect,
+        });
+});
+</script>
+<template>
+    <slot name="searchbar">
+        <VnSearchbar
+            v-if="searchBar"
+            v-bind="arrayDataProps"
+            :data-key="dataKey"
+            :label="$t(`${prefix}.search`)"
+            :info="$t(`${prefix}.searchInfo`)"
+        />
+    </slot>
+
+    <RightMenu>
+        <template #right-panel v-if="$slots['rightMenu'] || rightFilter">
+            <slot name="rightMenu">
+                <VnTableFilter
+                    v-if="rightFilter && columns"
+                    :data-key="dataKey"
+                    :array-data="arrayData"
+                    :columns="columns"
+                />
+            </slot>
+        </template>
+    </RightMenu>
+    <slot name="body" v-if="sectionValue == $route.name" />
+    <RouterView v-else />
+</template>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 1a69bc6c1..8aa725b4a 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -224,7 +224,7 @@ async function fetchFilter(val) {
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
-    arrayData.reset(['skip', 'filter.skip', 'page']);
+    arrayData.resetPagination();
 
     const { data } = await arrayData.applyFilter({ filter: fetchOptions });
     setOptions(data);
diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/src/components/common/__tests__/VnChangePassword.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnChangePassword.spec.js
rename to src/components/common/__tests__/VnChangePassword.spec.js
diff --git a/test/vitest/__tests__/components/common/VnDiscount.spec.js b/src/components/common/__tests__/VnDiscount.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnDiscount.spec.js
rename to src/components/common/__tests__/VnDiscount.spec.js
diff --git a/src/components/common/__tests__/VnDmsList.spec.js b/src/components/common/__tests__/VnDmsList.spec.js
new file mode 100644
index 000000000..9649943a2
--- /dev/null
+++ b/src/components/common/__tests__/VnDmsList.spec.js
@@ -0,0 +1,87 @@
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnDmsList from 'src/components/common/VnDmsList.vue';
+import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+describe('VnDmsList', () => {
+    let vm;
+    const dms = { 
+        userFk: 1, 
+        name: 'DMS 1' 
+    };
+    
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
+        vm = createWrapper(VnDmsList, {
+            props: {
+                model: 'WorkerDms/1110/filter',
+                defaultDmsCode: 'hhrrData',
+                filter: 'wd.workerFk',
+                updateModel: 'Workers',
+                deleteModel: 'WorkerDms',
+                downloadModel: 'WorkerDms' 
+            }
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('setData()', () => {
+        const data = [
+            { 
+                userFk: 1, 
+                name: 'Jessica',
+                lastName: 'Jones',
+                file: '4.jpg',
+                created: '2021-07-28 21:00:00'
+            },
+            { 
+                userFk: 2, 
+                name: 'Bruce',
+                lastName: 'Banner',
+                created: '2022-07-28 21:00:00',
+                dms: {
+                    userFk: 2, 
+                    name: 'Bruce',
+                    lastName: 'BannerDMS',
+                    created: '2022-07-28 21:00:00',
+                    file: '4.jpg',
+                } 
+            },
+            {
+                userFk: 3,
+                name: 'Natasha',
+                lastName: 'Romanoff',
+                file: '4.jpg',
+                created: '2021-10-28 21:00:00'
+            }  
+        ]
+
+        it('Should replace objects that contain the "dms" property with the value of the same and sort by creation date', () => {
+            vm.setData(data);
+            expect([vm.rows][0][0].lastName).toEqual('BannerDMS');
+            expect([vm.rows][0][1].lastName).toEqual('Romanoff');
+
+        });
+    });
+
+    describe('parseDms()', () => {
+        const resultDms = { ...dms, userId:1};
+        
+        it('Should add properties that end with "Fk" by changing the suffix to "Id"', () => {
+            const parsedDms = vm.parseDms(dms);
+            expect(parsedDms).toEqual(resultDms);
+        });
+    });
+
+    describe('showFormDialog()', () => {
+        const resultDms = { ...dms, userId:1};
+        
+        it('should call fn parseDms() and set show true if dms is defined', () => {
+            vm.showFormDialog(dms);
+            expect(vm.formDialog.show).toEqual(true);
+            expect(vm.formDialog.dms).toEqual(resultDms);
+        });
+    });
+});	
\ No newline at end of file
diff --git a/test/vitest/__tests__/components/common/VnLog.spec.js b/src/components/common/__tests__/VnLog.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnLog.spec.js
rename to src/components/common/__tests__/VnLog.spec.js
diff --git a/test/vitest/__tests__/components/common/VnSmsDialog.spec.js b/src/components/common/__tests__/VnSmsDialog.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnSmsDialog.spec.js
rename to src/components/common/__tests__/VnSmsDialog.spec.js
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index adb6fe802..2be508f9f 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -1,12 +1,14 @@
 <script setup>
-import { onMounted, ref, computed, watch } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
-import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+import { useFilterParams } from 'src/composables/useFilterParams';
+import { useRoute } from 'vue-router';
 
 const { t, te } = useI18n();
+const route = useRoute();
 const $props = defineProps({
     modelValue: {
         type: Object,
@@ -55,6 +57,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    arrayData: {
+        type: Object,
+        default: null,
+    },
 });
 
 const emit = defineEmits([
@@ -67,52 +73,19 @@ const emit = defineEmits([
     'setUserParams',
 ]);
 
-const arrayData = useArrayData($props.dataKey, {
-    exprBuilder: $props.exprBuilder,
-    searchUrl: $props.searchUrl,
-    navigate: $props.redirect ? {} : null,
-});
-const route = useRoute();
+const arrayData =
+    $props.arrayData ??
+    useArrayData($props.dataKey, {
+        exprBuilder: $props.exprBuilder,
+        searchUrl: $props.searchUrl,
+        navigate: $props.redirect ? {} : null,
+    });
+
 const store = arrayData.store;
-const userParams = ref({});
+const userParams = ref(useFilterParams($props.dataKey).params);
+const userOrders = ref(useFilterParams($props.dataKey).orders);
 
-defineExpose({ search, sanitizer, params: userParams });
-
-onMounted(() => {
-    if (!userParams.value) userParams.value = $props.modelValue ?? {};
-    emit('init', { params: userParams.value });
-});
-
-function setUserParams(watchedParams) {
-    if (!watchedParams || Object.keys(watchedParams).length == 0) return;
-
-    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
-    if (typeof watchedParams?.filter == 'string')
-        watchedParams.filter = JSON.parse(watchedParams.filter);
-
-    watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
-    const order = watchedParams.filter?.order;
-
-    delete watchedParams.filter;
-    userParams.value = sanitizer(watchedParams);
-    emit('setUserParams', userParams.value, order);
-}
-
-watch(
-    () => route.query[$props.searchUrl],
-    (val, oldValue) => (val || oldValue) && setUserParams(val)
-);
-
-watch(
-    () => arrayData.store.userParams,
-    (val, oldValue) => (val || oldValue) && setUserParams(val),
-    { immediate: true }
-);
-
-watch(
-    () => $props.modelValue,
-    (val) => (userParams.value = val ?? {})
-);
+defineExpose({ search, params: userParams, remove });
 
 const isLoading = ref(false);
 async function search(evt) {
@@ -123,10 +96,9 @@ async function search(evt) {
         isLoading.value = true;
         const filter = { ...userParams.value, ...$props.modelValue };
         store.userParamsChanged = true;
-        const { params: newParams } = await arrayData.addFilter({
+        await arrayData.addFilter({
             params: filter,
         });
-        userParams.value = newParams;
 
         if (!$props.showAll && !Object.values(filter).length) store.data = [];
         emit('search');
@@ -139,7 +111,7 @@ async function clearFilters() {
     try {
         isLoading.value = true;
         store.userParamsChanged = true;
-        arrayData.reset(['skip', 'filter.skip', 'page']);
+        arrayData.resetPagination();
         // Filtrar los params no removibles
         const removableFilters = Object.keys(userParams.value).filter((param) =>
             $props.unremovableParams.includes(param)
@@ -149,9 +121,8 @@ async function clearFilters() {
         for (const key of removableFilters) {
             newParams[key] = userParams.value[key];
         }
-        userParams.value = {};
-        userParams.value = { ...newParams }; // Actualizar los params con los removibles
-        await arrayData.applyFilter({ params: userParams.value });
+
+        await arrayData.applyFilter({ params: { ...newParams } });
 
         if (!$props.showAll) {
             store.data = [];
@@ -214,21 +185,6 @@ function formatValue(value) {
     return `"${value}"`;
 }
 
-function sanitizer(params) {
-    for (const [key, value] of Object.entries(params)) {
-        if (key === 'and' && Array.isArray(value)) {
-            value.forEach((item) => {
-                Object.assign(params, item);
-            });
-            delete params[key];
-        } else if (value && typeof value === 'object') {
-            const param = Object.values(value)[0];
-            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
-        }
-    }
-    return params;
-}
-
 const getLocale = (label) => {
     const param = label.split('.').at(-1);
     const globalLocale = `globals.params.${param}`;
@@ -313,8 +269,9 @@ const getLocale = (label) => {
         <QList dense class="list q-gutter-y-sm q-mt-sm">
             <slot
                 name="body"
-                :params="sanitizer(userParams)"
                 :get-locale="getLocale"
+                :params="userParams"
+                :orders="userOrders"
                 :search-fn="search"
             ></slot>
         </QList>
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 920836a93..a2ccd5d92 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -106,10 +106,13 @@ const store = arrayData.store;
 
 onMounted(async () => {
     if (props.autoLoad && !store.data?.length) await fetch();
+    else emit('onFetch', store.data);
     mounted.value = true;
 });
 
-onBeforeUnmount(() => arrayData.reset());
+onBeforeUnmount(() => {
+    arrayData.resetPagination();
+});
 
 watch(
     () => props.data,
@@ -137,8 +140,8 @@ const addFilter = async (filter, params) => {
 
 async function fetch(params) {
     useArrayData(props.dataKey, params);
-    arrayData.reset(['filter.skip', 'skip', 'page']);
-    await arrayData.fetch({ append: false, updateRouter: mounted.value });
+    arrayData.resetPagination();
+    await arrayData.fetch({ append: false });
     return emitStoreData();
 }
 
@@ -200,13 +203,20 @@ async function onLoad(index, done) {
     done(isDone);
 }
 
-defineExpose({ fetch, update, addFilter, paginate });
+defineExpose({
+    fetch,
+    update,
+    addFilter,
+    paginate,
+    userParams: arrayData.store.userParams,
+    currentFilter: arrayData.store.currentFilter,
+});
 </script>
 
 <template>
     <div class="full-width">
         <div
-            v-if="!props.autoLoad && !store.data && !isLoading"
+            v-if="!store.data && !store.data?.length && !isLoading"
             class="info-row q-pa-md text-center"
         >
             <h5>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 4e90245d6..4e284d8e4 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -63,6 +63,10 @@ const props = defineProps({
         type: Function,
         default: undefined,
     },
+    searchRemoveParams: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const searchText = ref();
@@ -96,17 +100,25 @@ onMounted(() => {
 });
 
 async function search() {
-    const staticParams = Object.entries(store.userParams);
-    arrayData.reset(['skip', 'page']);
+    const staticParams = Object.keys(store.userParams ?? {}).length
+        ? store.userParams
+        : store.defaultParams;
+    arrayData.resetPagination();
 
     const filter = {
         params: {
-            ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
-        ...{ filter: props.filter },
+        filter: props.filter,
     };
 
+    if (!props.searchRemoveParams || !searchText.value) {
+        filter.params = {
+            ...staticParams,
+            search: searchText.value,
+        };
+    }
+
     if (props.whereFilter) {
         filter.filter = {
             where: props.whereFilter(searchText.value),
diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/src/components/ui/__tests__/Paginate.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/Paginate.spec.js
rename to src/components/ui/__tests__/Paginate.spec.js
diff --git a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js b/src/components/ui/__tests__/VnLinkPhone.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnLinkPhone.spec.js
rename to src/components/ui/__tests__/VnLinkPhone.spec.js
diff --git a/test/vitest/__tests__/components/common/VnSms.spec.js b/src/components/ui/__tests__/VnSms.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnSms.spec.js
rename to src/components/ui/__tests__/VnSms.spec.js
diff --git a/test/vitest/__tests__/composables/downloadFile.spec.js b/src/composables/__tests__/downloadFile.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/downloadFile.spec.js
rename to src/composables/__tests__/downloadFile.spec.js
diff --git a/test/vitest/__tests__/composables/getExchange.spec.js b/src/composables/__tests__/getExchange.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/getExchange.spec.js
rename to src/composables/__tests__/getExchange.spec.js
diff --git a/test/vitest/__tests__/composables/getTotal.spec.js b/src/composables/__tests__/getTotal.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/getTotal.spec.js
rename to src/composables/__tests__/getTotal.spec.js
diff --git a/test/vitest/__tests__/composables/useAccountShortToStandard.spec.js b/src/composables/__tests__/useAccountShortToStandard.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useAccountShortToStandard.spec.js
rename to src/composables/__tests__/useAccountShortToStandard.spec.js
diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/src/composables/__tests__/useAcl.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useAcl.spec.js
rename to src/composables/__tests__/useAcl.spec.js
diff --git a/test/vitest/__tests__/composables/useArrayData.spec.js b/src/composables/__tests__/useArrayData.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useArrayData.spec.js
rename to src/composables/__tests__/useArrayData.spec.js
diff --git a/test/vitest/__tests__/composables/useRole.spec.js b/src/composables/__tests__/useRole.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useRole.spec.js
rename to src/composables/__tests__/useRole.spec.js
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/src/composables/__tests__/useSession.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useSession.spec.js
rename to src/composables/__tests__/useSession.spec.js
diff --git a/test/vitest/__tests__/composables/useTokenConfig.spec.js b/src/composables/__tests__/useTokenConfig.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useTokenConfig.spec.js
rename to src/composables/__tests__/useTokenConfig.spec.js
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 6e685ee20..1a91cc50b 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -25,11 +25,14 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         const searchUrl = store.searchUrl;
         if (query[searchUrl]) {
             const params = JSON.parse(query[searchUrl]);
-            const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
+            const filter =
+                params?.filter && typeof params?.filter == 'object'
+                    ? params?.filter
+                    : JSON.parse(params?.filter ?? '{}');
             delete params.filter;
 
             store.userParams = { ...store.userParams, ...params };
-            store.userFilter = { ...filter, ...store.userFilter };
+            store.filter = { ...filter, ...store.userFilter };
             if (filter?.order) store.order = filter.order;
         }
     });
@@ -61,6 +64,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                     store[option] = userOptions.keepOpts?.includes(option)
                         ? Object.assign(defaultOpts, store[option])
                         : defaultOpts;
+                    if (option === 'userParams') store.defaultParams = store[option];
                 }
             }
         }
@@ -75,7 +79,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         const filter = {
             limit: store.limit,
         };
-
         let userParams = { ...store.userParams };
 
         Object.assign(filter, store.userFilter);
@@ -143,6 +146,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         if (arrayDataStore.get(key)) arrayDataStore.reset(key, opts);
     }
 
+    function resetPagination() {
+        if (arrayDataStore.get(key)) arrayDataStore.resetPagination(key);
+    }
+
     function cancelRequest() {
         if (canceller) {
             canceller.abort();
@@ -166,7 +173,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
-        reset(['skip', 'filter.skip', 'page']);
+        resetPagination();
 
         await fetch({});
         return { filter, params };
@@ -193,7 +200,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
 
         store.order = order;
-        reset(['skip', 'filter.skip', 'page']);
+        resetPagination();
         fetch({});
         index++;
 
@@ -276,7 +283,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                else destroy();
                 return router.push(pushUrl);
             }
         }
@@ -328,5 +334,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         isLoading,
         deleteOption,
         reset,
+        resetPagination,
     };
 }
diff --git a/src/composables/useFilterParams.js b/src/composables/useFilterParams.js
new file mode 100644
index 000000000..2878e4b76
--- /dev/null
+++ b/src/composables/useFilterParams.js
@@ -0,0 +1,65 @@
+import { useArrayData } from 'src/composables/useArrayData';
+import { onBeforeMount, ref, watch } from 'vue';
+
+export function useFilterParams(key) {
+    if (!key) throw new Error('ArrayData: A key is required to use this composable');
+    const params = ref({});
+    const orders = ref({});
+    const arrayData = ref({});
+
+    onBeforeMount(() => {
+        arrayData.value = useArrayData(key);
+    });
+
+    watch(
+        () => arrayData.value.store?.currentFilter,
+        (val, oldValue) => (val || oldValue) && setUserParams(val),
+        { immediate: true, deep: true }
+    );
+
+    function parseOrder(urlOrders) {
+        const orderObject = {};
+        if (urlOrders) {
+            if (typeof urlOrders == 'string') urlOrders = [urlOrders];
+            for (const [index, orders] of urlOrders.entries()) {
+                const [name, direction] = orders.split(' ');
+                orderObject[name] = { direction, index: index + 1 };
+            }
+        }
+        orders.value = orderObject;
+    }
+
+    function setUserParams(watchedParams) {
+        if (!watchedParams || Object.keys(watchedParams).length == 0) return;
+
+        if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
+        if (typeof watchedParams?.filter == 'string')
+            watchedParams.filter = JSON.parse(watchedParams.filter);
+
+        watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
+        parseOrder(watchedParams.filter?.order);
+
+        delete watchedParams.filter;
+        params.value = sanitizer(watchedParams);
+    }
+
+    function sanitizer(params) {
+        for (const [key, value] of Object.entries(params)) {
+            if (key === 'and' && Array.isArray(value)) {
+                value.forEach((item) => {
+                    Object.assign(params, item);
+                });
+                delete params[key];
+            } else if (value && typeof value === 'object') {
+                const param = Object.values(value)[0];
+                if (typeof param == 'string') params[key] = param.replaceAll('%', '');
+            }
+        }
+        return params;
+    }
+
+    return {
+        params,
+        orders,
+    };
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 67d7a2bee..4a78811e6 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -861,6 +861,7 @@ components:
         ended: To
         mine: For me
         hasMinPrice: Minimum price
+        warehouseFk: Warehouse
         # LatestBuysFilter
         salesPersonFk: Buyer
         from: From
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4fa8699c9..2bfe7ec4b 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -853,6 +853,7 @@ components:
         ended: Hasta
         mine: Para mi
         hasMinPrice: Precio mínimo
+        wareHouseFk: Almacén
         # LatestBuysFilter
         salesPersonFk: Comprador
         active: Activo
diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue
index d80f835ec..6d3571661 100644
--- a/src/pages/Account/AccountAcls.vue
+++ b/src/pages/Account/AccountAcls.vue
@@ -1,16 +1,15 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import { useQuasar } from 'quasar';
 
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
+import VnSection from 'src/components/common/VnSection.vue';
 
 defineProps({
     id: {
@@ -21,13 +20,13 @@ defineProps({
 
 const { notify } = useNotify();
 const { t } = useI18n();
-const stateStore = useStateStore();
 const quasar = useQuasar();
 
 const tableRef = ref();
 const roles = ref();
 const validationsStore = useValidator();
 const { models } = validationsStore;
+const dataKey = 'AccountAcls';
 const exprBuilder = (param, value) => {
     switch (param) {
         case 'search':
@@ -134,38 +133,40 @@ const deleteAcl = async ({ id }) => {
 </script>
 
 <template>
-    <VnSearchbar
-        data-key="AccountAcls"
-        url="ACLs"
-        :expr-builder="exprBuilder"
-        :label="t('acls.search')"
-        :info="t('acls.searchInfo')"
-    />
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-    </QDrawer>
     <FetchData
         url="VnRoles?fields=['name']"
         auto-load
         @on-fetch="(data) => (roles = data)"
     />
-    <VnTable
-        ref="tableRef"
-        data-key="AccountAcls"
-        :url="`ACLs`"
-        :create="{
-            urlCreate: 'ACLs',
-            title: 'Create ACL',
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: {},
-        }"
-        order="id DESC"
-        :disable-option="{ card: true }"
+    <VnSection
+        :data-key="dataKey"
         :columns="columns"
-        default-mode="table"
-        :right-search="true"
-        :is-editable="true"
-        :use-model="true"
-    />
+        prefix="acls"
+        :array-data-props="{
+            url: 'ACLs',
+            order: 'id DESC',
+            exprBuilder,
+        }"
+    >
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'ACLs',
+                    title: 'Create ACL',
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {},
+                }"
+                :disable-option="{ card: true }"
+                :columns="columns"
+                default-mode="table"
+                :right-search="false"
+                :is-editable="true"
+                :use-model="true"
+            />
+        </template>
+    </VnSection>
 </template>
 
 <i18n>
diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
index c67283297..f6016fb6c 100644
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@@ -2,21 +2,12 @@
 import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const tableRef = ref();
 const { t } = useI18n();
-const stateStore = useStateStore();
+const dataKey = 'AccountAliasList';
 
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : { alias: { like: `%${value}%` } };
-    }
-};
 const columns = computed(() => [
     {
         align: 'left',
@@ -40,40 +31,45 @@ const columns = computed(() => [
         create: true,
     },
 ]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="AccountAliasList"
-                url="MailAliases"
-                :expr-builder="exprBuilder"
-                :label="t('mailAlias.search')"
-                :info="t('mailAlias.searchInfo')"
-            />
-        </Teleport>
-    </template>
-    <VnTable
-        ref="tableRef"
-        data-key="AccountAliasList"
-        url="MailAliases"
-        :create="{
-            urlCreate: 'MailAliases',
-            title: 'Create MailAlias',
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
-        }"
-        order="id DESC"
+    <VnSection
+        :data-key="dataKey"
         :columns="columns"
-        :disable-option="{ card: true }"
-        default-mode="table"
-        redirect="account/alias"
-        :is-editable="true"
-        :use-model="true"
-    />
+        prefix="mailAlias"
+        :array-data-props="{ url: 'MailAliases', order: 'id DESC', exprBuilder }"
+    >
+        <template #body>
+            <VnTable
+                :data-key="dataKey"
+                ref="tableRef"
+                :create="{
+                    urlCreate: 'MailAliases',
+                    title: 'Create MailAlias',
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {},
+                }"
+                :columns="columns"
+                :disable-option="{ card: true }"
+                default-mode="table"
+                redirect="account/alias"
+                :is-editable="true"
+                :use-model="true"
+                :right-search="false"
+            />
+        </template>
+    </VnSection>
 </template>
-
 <i18n>
     es:
         Id: Id
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 341dd92a2..c1c75fcee 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -1,19 +1,20 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref, computed } from 'vue';
+import { computed, ref } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import AccountFilter from './AccountFilter.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSection from 'src/components/common/VnSection.vue';
+import FetchData from 'src/components/FetchData.vue';
+
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const tableRef = ref();
 const filter = {
     include: { relation: 'role', scope: { fields: ['id', 'name'] } },
 };
+const dataKey = 'AccountList';
+const roles = ref([]);
 const columns = computed(() => [
     {
         align: 'left',
@@ -48,7 +49,7 @@ const columns = computed(() => [
             component: 'select',
             name: 'roleFk',
             attrs: {
-                url: 'VnRoles',
+                options: roles,
                 optionValue: 'id',
                 optionLabel: 'name',
             },
@@ -116,7 +117,8 @@ const columns = computed(() => [
         ],
     },
 ]);
-const exprBuilder = (param, value) => {
+
+function exprBuilder(param, value) {
     switch (param) {
         case 'search':
             return /^\d+$/.test(value)
@@ -133,52 +135,51 @@ const exprBuilder = (param, value) => {
         case 'roleFk':
             return { [param]: value };
     }
-};
+}
 </script>
 <template>
-    <VnSearchbar
-        data-key="AccountList"
-        :expr-builder="exprBuilder"
-        :label="t('account.search')"
-        :info="t('account.searchInfo')"
-        :filter="filter"
-    />
-    <RightMenu>
-        <template #right-panel>
-            <AccountFilter data-key="AccountList" />
-        </template>
-    </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="AccountList"
-        url="VnUsers/preview"
-        :create="{
-            urlCreate: 'VnUsers',
-            title: t('Create user'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
-        }"
-        :filter="filter"
-        order="id DESC"
+    <FetchData url="VnRoles" @on-fetch="(data) => (roles = data)" auto-load />
+    <VnSection
+        :data-key="dataKey"
         :columns="columns"
-        default-mode="table"
-        redirect="account"
-        :use-model="true"
-        :right-search="false"
-        auto-load
+        prefix="account"
+        :array-data-props="{
+            url: 'VnUsers/preview',
+            userFilter: filter,
+            order: 'id DESC',
+            exprBuilder,
+        }"
     >
-        <template #more-create-dialog="{ data }">
-            <QCardSection>
-                <VnInput
-                    :label="t('Password')"
-                    v-model="data.password"
-                    type="password"
-                    :required="true"
-                    autocomplete="new-password"
-                />
-            </QCardSection>
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :columns="columns"
+                :create="{
+                    urlCreate: 'VnUsers',
+                    title: t('Create user'),
+                    onDataSaved: ({ id }) => $refs.tableRef.redirect(id),
+                    formInitialData: {},
+                }"
+                default-mode="table"
+                redirect="account"
+                :use-model="true"
+                :right-search="false"
+            >
+                <template #more-create-dialog="{ data }">
+                    <QCardSection>
+                        <VnInput
+                            :label="t('Password')"
+                            v-model="data.password"
+                            type="password"
+                            :required="true"
+                            autocomplete="new-password"
+                        />
+                    </QCardSection>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 
 <i18n>
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
index 65951b3bf..3a814edc0 100644
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -1,12 +1,12 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
 const { t } = useI18n();
 </script>
 
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Alias"
         base-url="MailAliases"
         :descriptor="AliasDescriptor"
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 119a7fd07..35ff7e732 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -1,20 +1,8 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
-
-const { t } = useI18n();
 </script>
 
 <template>
-    <VnCard
-        data-key="Account"
-        :descriptor="AccountDescriptor"
-        search-data-key="AccountList"
-        :searchbar-props="{
-            url: 'VnUsers/preview',
-            label: t('account.search'),
-            info: t('account.searchInfo'),
-        }"
-    />
+    <VnCardBeta data-key="AccountId" :descriptor="AccountDescriptor" />
 </template>
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 3156f8e1e..4e10e1366 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -41,7 +41,7 @@ const hasAccount = ref(false);
     />
     <CardDescriptor
         ref="descriptor"
-        :url="`VnUsers/preview`"
+        url="VnUsers/preview"
         :filter="filter"
         module="Account"
         @on-fetch="setData"
diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index 5a21e18a5..e6c21ed34 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -30,7 +30,7 @@ const filter = {
 
 <template>
     <CardSummary
-        data-key="AccountSummary"
+        data-key="AccountId"
         ref="AccountSummary"
         url="VnUsers/preview"
         :filter="filter"
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index 5a27e2ed6..3c3d6b243 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -3,11 +3,13 @@ import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { useRoute } from 'vue-router';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RoleSummary from './Card/RoleSummary.vue';
+import VnSection from 'src/components/common/VnSection.vue';
+
 const route = useRoute();
 const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
 const $props = defineProps({
     id: {
         type: Number,
@@ -15,8 +17,10 @@ const $props = defineProps({
     },
 });
 const tableRef = ref();
+const url = 'VnRoles';
+const dataKey = 'AccountRoleList';
+
 const entityId = computed(() => $props.id || route.params.id);
-const { viewSummary } = useSummaryDialog();
 const columns = computed(() => [
     {
         align: 'left',
@@ -81,30 +85,32 @@ const exprBuilder = (param, value) => {
 </script>
 
 <template>
-    <VnSearchbar
-        data-key="AccountRolesList"
-        :expr-builder="exprBuilder"
-        :label="t('role.searchRoles')"
-        :info="t('role.searchInfo')"
-    />
-    <VnTable
-        ref="tableRef"
-        data-key="AccountRolesList"
-        :url="`VnRoles`"
-        :create="{
-            urlCreate: 'VnRoles',
-            title: t('Create rol'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {
-                editorFk: entityId,
-            },
-        }"
-        order="id ASC"
-        :disable-option="{ card: true }"
+    <VnSection
+        :data-key="dataKey"
         :columns="columns"
-        default-mode="table"
-        redirect="account/role"
-    />
+        prefix="role"
+        :array-data-props="{ url, exprBuilder, order: 'id ASC' }"
+    >
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'VnRoles',
+                    title: t('Create rol'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {
+                        editorFk: entityId,
+                    },
+                }"
+                :disable-option="{ card: true }"
+                :columns="columns"
+                default-mode="table"
+                redirect="account/role"
+                :right-search="false"
+            />
+        </template>
+    </VnSection>
 </template>
 
 <i18n>
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index a2d5710f4..7664deca8 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -1,20 +1,7 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
-
-const { t } = useI18n();
 </script>
 <template>
-    <VnCard
-        data-key="Role"
-        :descriptor="RoleDescriptor"
-        search-data-key="AccountRolesList"
-        :searchbar-props="{
-            url: 'VnRoles',
-            label: t('role.searchRoles'),
-            info: t('role.searchInfo'),
-            searchUrl: 'table',
-        }"
-    />
+    <VnCardBeta data-key="Role" :descriptor="RoleDescriptor" />
 </template>
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index 693fcdf48..b4b4fe316 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -43,7 +43,7 @@ const removeRole = async () => {
         :filter="filter"
         module="Role"
         @on-fetch="setData"
-        data-key="accountData"
+        data-key="Role"
         :title="data.title"
         :subtitle="data.subtitle"
         :summary="$props.summary"
diff --git a/src/pages/Account/Role/Card/RoleSummary.vue b/src/pages/Account/Role/Card/RoleSummary.vue
index fef85f919..f0daa77fb 100644
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ b/src/pages/Account/Role/Card/RoleSummary.vue
@@ -27,10 +27,10 @@ const filter = {
 <template>
     <CardSummary
         ref="summary"
-        :url="`VnRoles`"
+        :url="`VnRoles/${entityId}`"
         :filter="filter"
         @on-fetch="(data) => (role = data)"
-        data-key="RoleSummary"
+        data-key="Role"
     >
         <template #header> {{ role.id }} - {{ role.name }} </template>
         <template #body>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index f2f563923..88a6b11e9 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -66,7 +66,7 @@ account:
         mailInputInfo: All emails will be forwarded to the specified address.
 role:
     newRole: New role
-    searchRoles: Search role
+    search: Search role
     searchInfo: Search role by id or name
     description: Description
     id: Id
diff --git a/test/vitest/__tests__/pages/Claims/ClaimDescriptorMenu.spec.js b/src/pages/Claim/Card/__tests__/ClaimDescriptorMenu.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Claims/ClaimDescriptorMenu.spec.js
rename to src/pages/Claim/Card/__tests__/ClaimDescriptorMenu.spec.js
diff --git a/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js b/src/pages/Claim/Card/__tests__/ClaimLines.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
rename to src/pages/Claim/Card/__tests__/ClaimLines.spec.js
diff --git a/test/vitest/__tests__/pages/Claims/ClaimLinesImport.spec.js b/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Claims/ClaimLinesImport.spec.js
rename to src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
diff --git a/test/vitest/__tests__/pages/Claims/ClaimPhoto.spec.js b/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Claims/ClaimPhoto.spec.js
rename to src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index f7e2ffbf6..c28e95cb8 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -30,7 +30,7 @@ defineExpose({ states });
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <div class="q-pa-sm q-gutter-y-sm">
                 <VnInput
                     :label="t('claim.customerId')"
@@ -49,12 +49,9 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('Salesperson')"
                     v-model="params.salesPersonFk"
-                    @update:model-value="searchFn()"
                     url="Workers/activeWithInheritedRole"
                     :filter="{ where: { role: 'salesPerson' } }"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="firstName"
                     dense
                     outlined
@@ -63,12 +60,9 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('claim.attendedBy')"
                     v-model="params.attenderFk"
-                    @update:model-value="searchFn()"
                     url="Workers/activeWithInheritedRole"
                     :filter="{ where: { role: 'salesPerson' } }"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="firstName"
                     dense
                     outlined
@@ -77,9 +71,7 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('claim.state')"
                     v-model="params.claimStateFk"
-                    @update:model-value="searchFn()"
                     :options="states"
-                    option-value="id"
                     option-label="description"
                     dense
                     outlined
@@ -87,7 +79,6 @@ defineExpose({ states });
                 />
                 <VnInputDate
                     v-model="params.created"
-                    @update:model-value="searchFn()"
                     :label="t('claim.created')"
                     outlined
                     rounded
@@ -96,10 +87,7 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('Item')"
                     v-model="params.itemFk"
-                    @update:model-value="searchFn()"
                     url="Items/withName"
-                    option-value="id"
-                    option-label="name"
                     :use-like="false"
                     sort-by="id DESC"
                     outlined
@@ -118,21 +106,26 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('claim.responsible')"
                     v-model="params.claimResponsibleFk"
-                    @update:model-value="searchFn()"
                     url="Workers/activeWithInheritedRole"
                     :filter="{ where: { role: 'salesPerson' } }"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="firstName"
                     dense
                     outlined
                     rounded
                 />
+                <VnSelect
+                    :label="t('claim.zone')"
+                    v-model="params.zoneFk"
+                    url="Zones"
+                    :use-like="false"
+                    outlined
+                    rounded
+                    dense
+                />
                 <QCheckbox
                     v-model="params.myTeam"
                     :label="t('params.myTeam')"
-                    @update:model-value="searchFn()"
                     toggle-indeterminate
                 />
             </div>
@@ -153,6 +146,7 @@ en:
         created: Created
         myTeam: My team
         itemFk: Item
+        zoneFk: Zone
 es:
     params:
         search: Contiene
@@ -165,6 +159,7 @@ es:
         created: Creada
         myTeam: Mi equipo
         itemFk: Artículo
+        zoneFk: Zona
     Client Name: Nombre del cliente
     Salesperson: Comercial
     Item: Artículo
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 5f61db5c0..bb97162d8 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -10,6 +10,7 @@ import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -95,7 +96,12 @@ const columns = computed(() => [
                 optionLabel: 'description',
             },
         },
-        orderBy: 'priority',
+        orderBy: 'cs.priority',
+    },
+    {
+        align: 'left',
+        label: t('claim.zone'),
+        name: 'zoneFk',
     },
     {
         align: 'right',
@@ -132,7 +138,7 @@ const STATE_COLOR = {
     <VnTable
         data-key="ClaimList"
         url="Claims/filter"
-        :order="['priority ASC', 'created ASC']"
+        :order="['cs.priority ASC', 'created ASC']"
         :columns="columns"
         redirect="claim"
         :right-search="false"
@@ -148,6 +154,12 @@ const STATE_COLOR = {
                 <VnUserLink :name="row.workerName" :worker-id="row.workerFk" />
             </span>
         </template>
+        <template #column-zoneFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.zoneName }}
+                <ZoneDescriptorProxy :id="row.zoneId" />
+            </span>
+        </template>
     </VnTable>
 </template>
 
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 768c66f32..e9a349e0b 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -16,14 +16,17 @@ const { t } = useI18n();
 
 const businessTypes = ref([]);
 const contactChannels = ref([]);
-const handleSalesModelValue = (val) => ({
-    or: [
-        { id: val },
-        { name: val },
-        { nickname: { like: '%' + val + '%' } },
-        { code: { like: `${val}%` } },
-    ],
-});
+const handleSalesModelValue = (val) => {
+    if (!val) val = '';
+    return {
+        or: [
+            { id: val },
+            { name: val },
+            { nickname: { like: '%' + val + '%' } },
+            { code: { like: `${val}%` } },
+        ],
+    };
+};
 
 const exprBuilder = (param, value) => {
     return {
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 96f670542..c62ec7dbb 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -12,14 +12,17 @@ defineProps({
         required: true,
     },
 });
-const handleSalesModelValue = (val) => ({
-    or: [
-        { id: val },
-        { name: val },
-        { nickname: { like: '%' + val + '%' } },
-        { code: { like: `${val}%` } },
-    ],
-});
+const handleSalesModelValue = (val) => {
+    if (!val) val = '';
+    return {
+        or: [
+            { id: val },
+            { name: val },
+            { nickname: { like: '%' + val + '%' } },
+            { code: { like: `${val}%` } },
+        ],
+    };
+};
 
 const exprBuilder = (param, value) => {
     return {
diff --git a/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js b/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
rename to src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index a75dfa1b2..665e136e4 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -107,7 +107,7 @@ const setParams = (params) => {
 
 const getPreview = async () => {
     const params = {
-        recipientId: entityId,
+        recipientId: entityId.value,
     };
     const validationMessage = validateMessage();
     if (validationMessage) return notify(t(validationMessage), 'negative');
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index a8f7d0c5f..531c7e09e 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -32,7 +32,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnSelect
-                        :label="t('components.itemsFilterPanel.buyerFk')"
+                        :label="t('params.buyerFk')"
                         v-model="params.buyerFk"
                         :options="itemTypeWorkersOptions"
                         option-value="id"
@@ -51,7 +51,7 @@ const itemTypeWorkersOptions = ref([]);
                         url="Warehouses"
                         auto-load
                         :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-                        :label="t('globals.warehouse')"
+                        :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         option-label="name"
                         option-value="id"
@@ -66,7 +66,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('components.itemsFilterPanel.started')"
+                        :label="t('params.started')"
                         v-model="params.started"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -76,7 +76,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('components.itemsFilterPanel.ended')"
+                        :label="t('params.ended')"
                         v-model="params.ended"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -86,7 +86,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('components.itemsFilterPanel.mine')"
+                        :label="t('params.mine')"
                         v-model="params.mine"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -94,14 +94,14 @@ const itemTypeWorkersOptions = ref([]);
 
                     <QCheckbox
                         v-model="params.showBadDates"
-                        :label="t(`components.itemsFilterPanel.showBadDates`)"
+                        :label="t(`params.showBadDates`)"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
                     >
                     </QCheckbox>
 
                     <QCheckbox
-                        :label="t('components.itemsFilterPanel.hasMinPrice')"
+                        :label="t('params.hasMinPrice')"
                         v-model="params.hasMinPrice"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -111,3 +111,23 @@ const itemTypeWorkersOptions = ref([]);
         </template>
     </ItemsFilterPanel>
 </template>
+<i18n>
+en:
+    params:
+        buyerFk: Buyer
+        warehouseFk: Warehouse
+        started: Started
+        ended: Ended
+        mine: Mine
+        showBadDates: Show future items
+        hasMinPrice: Has Min Price
+es:
+    params:
+        buyerFk: Comprador
+        warehouseFk: Almacén
+        started: Desde
+        ended: Hasta
+        mine: Para mi
+        showBadDates: Ver items a futuro
+        hasMinPrice: Precio mínimo
+ </i18n>
diff --git a/test/vitest/__tests__/pages/Login/Login.spec.js b/src/pages/Login/__tests__/Login.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Login/Login.spec.js
rename to src/pages/Login/__tests__/Login.spec.js
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 82578a61f..48710d696 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -281,6 +281,7 @@ en:
         problems: With problems
         pending: Pending
         alertLevel: Grouped State
+        department: Department
     FREE: Free
     DELIVERED: Delivered
     ON_PREPARATION: On preparation
@@ -300,6 +301,7 @@ es:
         problems: Con problemas
         pending: Pendiente
         alertLevel: Estado agrupado
+        department: Departamento
     FREE: Libre
     DELIVERED: Servido
     ON_PREPARATION: En preparación
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 4ad009133..da2e88aa9 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -86,6 +86,7 @@ watch(
         url="Orders/CatalogFilter"
         :label="t('Search items')"
         :info="t('You can search items by name or id')"
+        :search-remove-params="false"
     />
     <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <OrderCatalogFilter
diff --git a/src/pages/Order/Card/OrderVolume.vue b/src/pages/Order/Card/OrderVolume.vue
index 27ee24197..fb104157e 100644
--- a/src/pages/Order/Card/OrderVolume.vue
+++ b/src/pages/Order/Card/OrderVolume.vue
@@ -71,9 +71,11 @@ onMounted(async () => (stateStore.rightDrawer = false));
         auto-load
     />
     <QCard v-if="volumeSummary" class="order-volume-summary q-pa-lg">
-        <VnLv :label="t('total')" :value="`${volumeSummary?.totalVolume} m³`" />
+        <VnLv 
+        :label="`${t('total')}: `" 
+        :value="`${volumeSummary?.totalVolume} m³`" />
         <VnLv
-            :label="t('boxes')"
+            :label="`${t('boxes')}: `"
             :value="`${dashIfEmpty(volumeSummary?.totalBoxes)} U`"
         />
     </QCard>
@@ -111,12 +113,12 @@ onMounted(async () => (stateStore.rightDrawer = false));
     </VnTable>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .order-volume-summary {
     .vn-label-value {
         display: flex;
         justify-content: flex-end;
-        gap: 2%;
+        gap: 0.5%;
 
         .label {
             color: var(--vn-label-color);
diff --git a/src/pages/Ticket/Card/TicketBoxing.vue b/src/pages/Ticket/Card/TicketBoxing.vue
index bd8cad03f..816419dd5 100644
--- a/src/pages/Ticket/Card/TicketBoxing.vue
+++ b/src/pages/Ticket/Card/TicketBoxing.vue
@@ -11,6 +11,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const stateStore = useStateStore();
 onMounted(async () => {
+    stateStore.rightDrawer = true;
     await fetch();
 });
 
@@ -148,7 +149,6 @@ async function getVideoList(expeditionId, timed) {
             </QItem>
         </QList>
     </Teleport>
-
     <QCard>
         <QCarousel animated v-model="slide" height="max-content">
             <QCarouselSlide
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 73b6f5543..6886a8e57 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,23 +1,7 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
-import TicketFilter from '../TicketFilter.vue';
-
-const { t } = useI18n();
 </script>
 <template>
-    <VnCard
-        data-key="Ticket"
-        base-url="Tickets"
-        :filter-panel="TicketFilter"
-        :descriptor="TicketDescriptor"
-        search-data-key="TicketList"
-        :searchbar-props="{
-            url: 'Tickets/filter',
-            label: t('card.search'),
-            info: t('card.searchInfo'),
-        }"
-    />
+    <VnCardBeta data-key="Ticket" base-url="Tickets" :descriptor="TicketDescriptor" />
 </template>
diff --git a/test/vitest/__tests__/pages/Tickets/TicketBoxing.spec.js b/src/pages/Ticket/Card/__tests__/TicketBoxing.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Tickets/TicketBoxing.spec.js
rename to src/pages/Ticket/Card/__tests__/TicketBoxing.spec.js
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 786f5e012..5147af81f 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -8,13 +8,11 @@ import { useQuasar } from 'quasar';
 import { toDate, toCurrency, dashIfEmpty } from 'src/filters/index';
 import useNotify from 'src/composables/useNotify';
 import TicketSummary from './Card/TicketSummary.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'src/components/FetchData.vue';
@@ -23,6 +21,7 @@ import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -66,6 +65,7 @@ const dialogData = ref();
 const companiesOptions = ref([]);
 const accountingOptions = ref([]);
 const amountToReturn = ref();
+const dataKey = 'TicketList';
 
 const columns = computed(() => [
     {
@@ -455,223 +455,228 @@ function setReference(data) {
         @on-fetch="(data) => (accountingOptions = data)"
         auto-load
     />
-    <VnSearchbar
-        data-key="TicketList"
-        :label="t('Search ticket')"
-        :info="t('You can search by ticket id or alias')"
-        data-cy="ticketListSearchBar"
-    />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="card"
+        :array-data-props="{
+            url: 'Tickets/filter',
+            order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
+            exprBuilder,
+        }"
+    >
+        <template #rightMenu>
             <TicketFilter data-key="TicketList" />
         </template>
-    </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="TicketList"
-        url="Tickets/filter"
-        :create="{
-            urlCreate: 'Tickets/new',
-            title: t('ticketList.createTicket'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: { clientId: null },
-        }"
-        default-mode="table"
-        :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
-        :columns="columns"
-        :user-params="userParams"
-        :right-search="false"
-        redirect="ticket"
-        v-model:selected="selectedRows"
-        :table="{
-            'row-key': 'id',
-            selection: 'multiple',
-        }"
-        data-cy="ticketListTable"
-    >
-        <template #column-statusIcons="{ row }">
-            <TicketProblems :row="row" />
-        </template>
-        <template #column-salesPersonFk="{ row }">
-            <span class="link" @click.stop>
-                {{ dashIfEmpty(row.userName) }}
-                <CustomerDescriptorProxy :id="row.salesPersonFk" />
-            </span>
-        </template>
-        <template #column-shippedDate="{ row }">
-            <span v-if="getDateColor(row.shipped)">
-                <QChip :class="getDateColor(row.shipped)" dense square>
-                    {{ toDate(row.shippedDate) }}
-                </QChip>
-            </span>
-        </template>
-        <template #column-nickname="{ row }">
-            <span class="link" @click.stop>
-                {{ row.nickname }}
-                <CustomerDescriptorProxy :id="row.clientFk" />
-            </span>
-        </template>
-        <template #column-addressNickname="{ row }">
-            <span class="link" @click.stop>
-                {{ row.addressNickname }}
-                <CustomerDescriptorProxy :id="row.clientFk" />
-            </span>
-        </template>
-        <template #column-stateFk="{ row }">
-            <span v-if="row.refFk">
-                <span class="link" @click.stop>
-                    {{ row.refFk }}
-                    <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
-                </span>
-            </span>
-            <span v-else-if="getColor(row)">
-                <QChip :class="getColor(row)" dense square>
-                    {{ row.state }}
-                </QChip>
-            </span>
-            <span v-else>
-                {{ row.state }}
-            </span>
-        </template>
-        <template #column-zoneFk="{ row }">
-            <span class="link" @click.stop>
-                {{ dashIfEmpty(row.zoneName) }}
-                <ZoneDescriptorProxy :id="row.zoneFk" />
-            </span>
-        </template>
-        <template #column-totalWithVat="{ row }">
-            <QChip
-                v-if="row.totalWithVat > 0 && row.totalWithVat < 50"
-                class="bg-warning"
-                dense
-                square
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'Tickets/new',
+                    title: t('ticketList.createTicket'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: { clientId: null },
+                }"
+                default-mode="table"
+                :columns="columns"
+                :user-params="userParams"
+                :right-search="false"
+                redirect="ticket"
+                v-model:selected="selectedRows"
+                :table="{
+                    'row-key': 'id',
+                    selection: 'multiple',
+                }"
+                data-cy="ticketListTable"
             >
-                {{ row.totalWithVat }}
-            </QChip>
-        </template>
-        <template #more-create-dialog="{ data }">
-            <VnRow>
-                <VnSelect
-                    url="Clients"
-                    :fields="['id', 'name']"
-                    :label="t('ticketList.client')"
-                    v-model="data.clientId"
-                    :options="clientsOptions"
-                    option-value="id"
-                    option-label="name"
-                    hide-selected
-                    required
-                    @update:model-value="(client) => onClientSelected(data)"
-                    :sort-by="'id ASC'"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>
-                                    {{ scope.opt.name }}
-                                </QItemLabel>
-                                <QItemLabel caption>
-                                    {{ `#${scope.opt.id}` }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-            </VnRow>
-            <VnRow>
-                <VnSelect
-                    :label="t('basicData.address')"
-                    v-model="data.addressId"
-                    :options="addressesOptions"
-                    option-value="id"
-                    option-label="nickname"
-                    hide-selected
-                    map-options
-                    required
-                    :disable="!data.clientId"
-                    :sort-by="'isActive DESC'"
-                    @update:model-value="() => fetchAvailableAgencies(data)"
-                >
-                    <template #option="scope">
-                        <QItem
-                            v-bind="scope.itemProps"
-                            :class="{ disabled: !scope.opt.isActive }"
+                <template #column-statusIcons="{ row }">
+                    <TicketProblems :row="row" />
+                </template>
+                <template #column-salesPersonFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ dashIfEmpty(row.userName) }}
+                        <CustomerDescriptorProxy :id="row.salesPersonFk" />
+                    </span>
+                </template>
+                <template #column-shippedDate="{ row }">
+                    <span v-if="getDateColor(row.shipped)">
+                        <QChip :class="getDateColor(row.shipped)" dense square>
+                            {{ toDate(row.shippedDate) }}
+                        </QChip>
+                    </span>
+                </template>
+                <template #column-nickname="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.nickname }}
+                        <CustomerDescriptorProxy :id="row.clientFk" />
+                    </span>
+                </template>
+                <template #column-addressNickname="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.addressNickname }}
+                        <CustomerDescriptorProxy :id="row.clientFk" />
+                    </span>
+                </template>
+                <template #column-stateFk="{ row }">
+                    <span v-if="row.refFk">
+                        <span class="link" @click.stop>
+                            {{ row.refFk }}
+                            <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+                        </span>
+                    </span>
+                    <span v-else-if="getColor(row)">
+                        <QChip :class="getColor(row)" dense square>
+                            {{ row.state }}
+                        </QChip>
+                    </span>
+                    <span v-else>
+                        {{ row.state }}
+                    </span>
+                </template>
+                <template #column-zoneFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ dashIfEmpty(row.zoneName) }}
+                        <ZoneDescriptorProxy :id="row.zoneFk" />
+                    </span>
+                </template>
+                <template #column-totalWithVat="{ row }">
+                    <QChip
+                        v-if="row.totalWithVat > 0 && row.totalWithVat < 50"
+                        class="bg-warning"
+                        dense
+                        square
+                    >
+                        {{ row.totalWithVat }}
+                    </QChip>
+                </template>
+                <template #more-create-dialog="{ data }">
+                    <VnRow>
+                        <VnSelect
+                            url="Clients"
+                            :fields="['id', 'name']"
+                            :label="t('ticketList.client')"
+                            v-model="data.clientId"
+                            :options="clientsOptions"
+                            option-value="id"
+                            option-label="name"
+                            hide-selected
+                            required
+                            @update:model-value="(client) => onClientSelected(data)"
+                            :sort-by="'id ASC'"
                         >
-                            <QItemSection style="min-width: min-content" avatar>
-                                <QIcon
-                                    v-if="
-                                        scope.opt.isActive &&
-                                        selectedClient?.defaultAddressFk === scope.opt.id
-                                    "
-                                    size="sm"
-                                    color="grey"
-                                    name="star"
-                                    class="fill-icon"
-                                />
-                            </QItemSection>
-                            <QItemSection>
-                                <QItemLabel
-                                    :class="{
-                                        'color-vn-label': !scope.opt?.isActive,
-                                    }"
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{ scope.opt.name }}
+                                        </QItemLabel>
+                                        <QItemLabel caption>
+                                            {{ `#${scope.opt.id}` }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                    </VnRow>
+                    <VnRow>
+                        <VnSelect
+                            :label="t('basicData.address')"
+                            v-model="data.addressId"
+                            :options="addressesOptions"
+                            option-value="id"
+                            option-label="nickname"
+                            hide-selected
+                            map-options
+                            required
+                            :disable="!data.clientId"
+                            :sort-by="'isActive DESC'"
+                            @update:model-value="() => fetchAvailableAgencies(data)"
+                        >
+                            <template #option="scope">
+                                <QItem
+                                    v-bind="scope.itemProps"
+                                    :class="{ disabled: !scope.opt.isActive }"
                                 >
-                                    {{
-                                        `${
-                                            !scope.opt?.isActive
-                                                ? t('basicData.inactive')
-                                                : ''
-                                        } `
-                                    }}
-                                    <span>
-                                        {{ scope.opt?.nickname }}:
-                                        {{ scope.opt?.street }}, {{ scope.opt?.city }}
-                                    </span>
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-            </VnRow>
-            <VnRow>
-                <div class="col">
-                    <VnInputDate
-                        placeholder="dd-mm-aaa"
-                        :label="t('globals.landed')"
-                        v-model="data.landed"
-                        @update:model-value="() => fetchAvailableAgencies(data)"
-                    />
-                </div>
-            </VnRow>
-            <VnRow>
-                <div class="col">
-                    <VnSelect
-                        url="Warehouses"
-                        :sort-by="['name']"
-                        :label="t('globals.warehouse')"
-                        v-model="data.warehouseId"
-                        :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        required
-                        @update:model-value="() => fetchAvailableAgencies(data)"
-                    />
-                </div>
-            </VnRow>
-            <VnRow>
-                <div class="col">
-                    <VnSelect
-                        :label="t('globals.agency')"
-                        v-model="data.agencyModeId"
-                        :options="agenciesOptions"
-                        option-value="agencyModeFk"
-                        option-label="agencyMode"
-                        hide-selected
-                    />
-                </div>
-            </VnRow>
+                                    <QItemSection style="min-width: min-content" avatar>
+                                        <QIcon
+                                            v-if="
+                                                scope.opt.isActive &&
+                                                selectedClient?.defaultAddressFk ===
+                                                    scope.opt.id
+                                            "
+                                            size="sm"
+                                            color="grey"
+                                            name="star"
+                                            class="fill-icon"
+                                        />
+                                    </QItemSection>
+                                    <QItemSection>
+                                        <QItemLabel
+                                            :class="{
+                                                'color-vn-label': !scope.opt?.isActive,
+                                            }"
+                                        >
+                                            {{
+                                                `${
+                                                    !scope.opt?.isActive
+                                                        ? t('basicData.inactive')
+                                                        : ''
+                                                } `
+                                            }}
+                                            <span>
+                                                {{ scope.opt?.nickname }}:
+                                                {{ scope.opt?.street }},
+                                                {{ scope.opt?.city }}
+                                            </span>
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                    </VnRow>
+                    <VnRow>
+                        <div class="col">
+                            <VnInputDate
+                                placeholder="dd-mm-aaa"
+                                :label="t('globals.landed')"
+                                v-model="data.landed"
+                                @update:model-value="() => fetchAvailableAgencies(data)"
+                            />
+                        </div>
+                    </VnRow>
+                    <VnRow>
+                        <div class="col">
+                            <VnSelect
+                                url="Warehouses"
+                                :sort-by="['name']"
+                                :label="t('globals.warehouse')"
+                                v-model="data.warehouseId"
+                                :options="warehousesOptions"
+                                option-value="id"
+                                option-label="name"
+                                hide-selected
+                                required
+                                @update:model-value="() => fetchAvailableAgencies(data)"
+                            />
+                        </div>
+                    </VnRow>
+                    <VnRow>
+                        <div class="col">
+                            <VnSelect
+                                :label="t('globals.agency')"
+                                v-model="data.agencyModeId"
+                                :options="agenciesOptions"
+                                option-value="agencyModeFk"
+                                option-label="agencyMode"
+                                hide-selected
+                            />
+                        </div>
+                    </VnRow>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
     <QPageSticky :offset="[20, 80]" style="z-index: 2">
         <QBtn
             v-if="hasSelectedRows"
diff --git a/test/vitest/__tests__/pages/Tickets/TicketAdvance.spec.js b/src/pages/Ticket/__tests__/TicketAdvance.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Tickets/TicketAdvance.spec.js
rename to src/pages/Ticket/__tests__/TicketAdvance.spec.js
diff --git a/test/vitest/__tests__/pages/Wagons/WagonCreate.spec.js b/src/pages/Wagon/__tests__/WagonCreate.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Wagons/WagonCreate.spec.js
rename to src/pages/Wagon/__tests__/WagonCreate.spec.js
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 491e5e180..c480d5bd8 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -381,7 +381,7 @@ const isUnsatisfied = async (reason) => {
 
 const resendEmail = async () => {
     const params = {
-        recipient: worker.value?.user?.email,
+        recipient: worker.value[0]?.user?.emailUser?.email,
         week: selectedWeekNumber.value,
         year: selectedDate.value.getFullYear(),
         workerId: Number(route.params.id),
diff --git a/test/vitest/__tests__/pages/Worker/WorkerNotificationsManager.spec.js b/src/pages/Worker/Card/__tests__/WorkerNotificationsManager.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Worker/WorkerNotificationsManager.spec.js
rename to src/pages/Worker/Card/__tests__/WorkerNotificationsManager.spec.js
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"
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index 7200131da..466db9539 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -1,4 +1,7 @@
 import { RouterView } from 'vue-router';
+import accountCard from './account/accountCard';
+import roleCard from './account/roleCard';
+import aliasCard from './account/aliasCard';
 
 export default {
     path: '/account',
@@ -8,62 +11,76 @@ export default {
         icon: 'face',
         moduleName: 'Account',
         keyBinding: 'u',
-    },
-    component: RouterView,
-    redirect: { name: 'AccountMain' },
-    menus: {
-        main: [
+        menu: [
             'AccountList',
-            'AccountAliasList',
             'AccountRoles',
+            'AccountAlias',
             'AccountAccounts',
             'AccountLdap',
             'AccountSamba',
             'AccountAcls',
             'AccountConnections',
         ],
-        card: [
-            'AccountBasicData',
-            'AccountInheritedRoles',
-            'AccountMailForwarding',
-            'AccountMailAlias',
-            'AccountPrivileges',
-            'AccountLog',
-        ],
     },
+    component: RouterView,
+    redirect: { name: 'AccountMain' },
     children: [
         {
             path: '',
             name: 'AccountMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
-            redirect: { name: 'AccountList' },
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'AccountIndexMain' },
             children: [
                 {
-                    path: 'list',
-                    name: 'AccountList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
+                    path: '',
+                    name: 'AccountIndexMain',
+                    redirect: { name: 'AccountList' },
                     component: () => import('src/pages/Account/AccountList.vue'),
+                    children: [
+                        {
+                            name: 'AccountList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        accountCard,
+                    ],
                 },
                 {
-                    path: 'role-list',
+                    path: 'role',
                     name: 'AccountRoles',
+                    redirect: { name: 'AccountRoleList' },
                     meta: {
                         title: 'roles',
                         icon: 'group',
                     },
                     component: () => import('src/pages/Account/Role/AccountRoles.vue'),
+                    children: [
+                        {
+                            name: 'AccountRoleList',
+                            path: 'list',
+                        },
+                        roleCard,
+                    ],
                 },
                 {
-                    path: 'alias-list',
-                    name: 'AccountAliasList',
+                    path: 'alias',
+                    name: 'AccountAlias',
+                    redirect: { name: 'AccountAliasList' },
                     meta: {
                         title: 'alias',
                         icon: 'email',
                     },
                     component: () => import('src/pages/Account/AccountAliasList.vue'),
+                    children: [
+                        {
+                            name: 'AccountAliasList',
+                            path: 'list',
+                        },
+                        aliasCard,
+                    ],
                 },
                 {
                     path: 'acls',
@@ -120,81 +137,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'AccountCard',
-            path: ':id',
-            component: () => import('src/pages/Account/Card/AccountCard.vue'),
-            redirect: { name: 'AccountSummary' },
-            children: [
-                {
-                    name: 'AccountSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Account/Card/AccountSummary.vue'),
-                },
-                {
-                    name: 'AccountBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Card/AccountBasicData.vue'),
-                },
-                {
-                    name: 'AccountInheritedRoles',
-                    path: 'inherited-roles',
-                    meta: {
-                        title: 'inheritedRoles',
-                        icon: 'group',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Card/AccountInheritedRoles.vue'),
-                },
-                {
-                    name: 'AccountMailForwarding',
-                    path: 'mail-forwarding',
-                    meta: {
-                        title: 'mailForwarding',
-                        icon: 'forward',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Card/AccountMailForwarding.vue'),
-                },
-                {
-                    name: 'AccountMailAlias',
-                    path: 'mail-alias',
-                    meta: {
-                        title: 'mailAlias',
-                        icon: 'email',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Card/AccountMailAlias.vue'),
-                },
-                {
-                    name: 'AccountPrivileges',
-                    path: 'privileges',
-                    meta: {
-                        title: 'privileges',
-                        icon: 'badge',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Card/AccountPrivileges.vue'),
-                },
-                {
-                    name: 'AccountLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Account/Card/AccountLog.vue'),
-                },
-            ],
-        },
     ],
 };
diff --git a/src/router/modules/account/accountCard.js b/src/router/modules/account/accountCard.js
new file mode 100644
index 000000000..3ba687adf
--- /dev/null
+++ b/src/router/modules/account/accountCard.js
@@ -0,0 +1,81 @@
+export default {
+    name: 'AccountCard',
+    path: ':id',
+    redirect: { name: 'AccountSummary' },
+    component: () => import('src/pages/Account/Card/AccountCard.vue'),
+    meta: {
+        menu: [
+            'AccountBasicData',
+            'AccountInheritedRoles',
+            'AccountMailForwarding',
+            'AccountMailAlias',
+            'AccountPrivileges',
+            'AccountLog',
+        ],
+    },
+    children: [
+        {
+            name: 'AccountSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Account/Card/AccountSummary.vue'),
+        },
+        {
+            name: 'AccountBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Account/Card/AccountBasicData.vue'),
+        },
+        {
+            name: 'AccountInheritedRoles',
+            path: 'inherited-roles',
+            meta: {
+                title: 'inheritedRoles',
+                icon: 'group',
+            },
+            component: () => import('src/pages/Account/Card/AccountInheritedRoles.vue'),
+        },
+        {
+            name: 'AccountMailForwarding',
+            path: 'mail-forwarding',
+            meta: {
+                title: 'mailForwarding',
+                icon: 'forward',
+            },
+            component: () => import('src/pages/Account/Card/AccountMailForwarding.vue'),
+        },
+        {
+            name: 'AccountMailAlias',
+            path: 'mail-alias',
+            meta: {
+                title: 'mailAlias',
+                icon: 'email',
+            },
+            component: () => import('src/pages/Account/Card/AccountMailAlias.vue'),
+        },
+        {
+            name: 'AccountPrivileges',
+            path: 'privileges',
+            meta: {
+                title: 'privileges',
+                icon: 'badge',
+            },
+            component: () => import('src/pages/Account/Card/AccountPrivileges.vue'),
+        },
+        {
+            name: 'AccountLog',
+            path: 'log',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Account/Card/AccountLog.vue'),
+        },
+    ],
+};
diff --git a/src/router/modules/account/aliasCard.js b/src/router/modules/account/aliasCard.js
new file mode 100644
index 000000000..cbbd31e51
--- /dev/null
+++ b/src/router/modules/account/aliasCard.js
@@ -0,0 +1,36 @@
+export default {
+    name: 'AliasCard',
+    path: ':id',
+    component: () => import('src/pages/Account/Alias/Card/AliasCard.vue'),
+    redirect: { name: 'AliasSummary' },
+    meta: { menu: ['AliasBasicData', 'AliasUsers'] },
+    children: [
+        {
+            name: 'AliasSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Account/Alias/Card/AliasSummary.vue'),
+        },
+        {
+            name: 'AliasBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Account/Alias/Card/AliasBasicData.vue'),
+        },
+        {
+            name: 'AliasUsers',
+            path: 'users',
+            meta: {
+                title: 'aliasUsers',
+                icon: 'group',
+            },
+            component: () => import('src/pages/Account/Alias/Card/AliasUsers.vue'),
+        },
+    ],
+};
diff --git a/src/router/modules/account/roleCard.js b/src/router/modules/account/roleCard.js
new file mode 100644
index 000000000..c36ce71b9
--- /dev/null
+++ b/src/router/modules/account/roleCard.js
@@ -0,0 +1,57 @@
+export default {
+    name: 'RoleCard',
+    path: ':id',
+    component: () => import('src/pages/Account/Role/Card/RoleCard.vue'),
+    redirect: { name: 'RoleSummary' },
+    meta: {
+        menu: ['RoleBasicData', 'SubRoles', 'InheritedRoles', 'RoleLog'],
+    },
+    children: [
+        {
+            name: 'RoleSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Account/Role/Card/RoleSummary.vue'),
+        },
+        {
+            name: 'RoleBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Account/Role/Card/RoleBasicData.vue'),
+        },
+        {
+            name: 'SubRoles',
+            path: 'sub-roles',
+            meta: {
+                title: 'subRoles',
+                icon: 'group',
+            },
+            component: () => import('src/pages/Account/Role/Card/SubRoles.vue'),
+        },
+
+        {
+            name: 'InheritedRoles',
+            path: 'inherited-roles',
+            meta: {
+                title: 'inheritedRoles',
+                icon: 'account_tree',
+            },
+            component: () => import('src/pages/Account/Role/Card/InheritedRoles.vue'),
+        },
+        {
+            name: 'RoleLog',
+            path: 'log',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Account/Role/Card/RoleLog.vue'),
+        },
+    ],
+};
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index b58a58e8d..8b0a70896 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -27,7 +27,7 @@ export default {
         {
             name: 'ClaimMain',
             path: '',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'ClaimList' },
             children: [
                 {
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 1b707f1a2..9e7f6fe70 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -39,7 +39,7 @@ export default {
         {
             path: '',
             name: 'CustomerMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'CustomerList' },
             children: [
                 {
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 3add239df..26ce773c5 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -25,7 +25,7 @@ export default {
         {
             path: '',
             name: 'EntryMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'EntryList' },
             children: [
                 {
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index bf7e46b00..f28fed1c2 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -8,7 +8,7 @@ import Worker from './worker';
 import Shelving from './shelving';
 import Wagon from './wagon';
 import Route from './route';
-import Supplier from './Supplier';
+import Supplier from './supplier';
 import Travel from './travel';
 import Order from './order';
 import Department from './department';
@@ -20,8 +20,6 @@ import ItemType from './itemType';
 import Zone from './zone';
 import Account from './account';
 import Monitor from './monitor';
-import MailAlias from './mailAlias';
-import Role from './role';
 
 export default [
     Item,
@@ -45,7 +43,5 @@ export default [
     ItemType,
     Zone,
     Account,
-    MailAlias,
     Monitor,
-    Role,
 ];
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 168d64f37..788b27d37 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -25,7 +25,7 @@ export default {
         {
             path: '',
             name: 'InvoiceInMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'InvoiceInList' },
             children: [
                 {
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 5e83b0859..53d27d0e8 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -18,7 +18,7 @@ export default {
         {
             path: '',
             name: 'InvoiceOutMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'InvoiceOutList' },
             children: [
                 {
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 0f810434c..e2afd6c7b 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -36,7 +36,7 @@ export default {
         {
             path: '',
             name: 'ItemMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'ItemList' },
             children: [
                 {
diff --git a/src/router/modules/mailAlias.js b/src/router/modules/mailAlias.js
deleted file mode 100644
index 8e0f8abdc..000000000
--- a/src/router/modules/mailAlias.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { RouterView } from 'vue-router';
-
-export default {
-    path: 'account/alias',
-    name: 'Alias',
-    meta: {
-        title: 'alias',
-        icon: 'email',
-        moduleName: 'Alias',
-    },
-    component: RouterView,
-    redirect: { name: 'AccountAliasList' },
-    menus: {
-        main: [],
-        card: ['AliasBasicData', 'AliasUsers'],
-    },
-    children: [
-        {
-            name: 'AliasCard',
-            path: ':id',
-            component: () => import('src/pages/Account/Alias/Card/AliasCard.vue'),
-            redirect: { name: 'AliasSummary' },
-            children: [
-                {
-                    name: 'AliasSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Alias/Card/AliasSummary.vue'),
-                },
-                {
-                    name: 'AliasBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Alias/Card/AliasBasicData.vue'),
-                },
-                {
-                    name: 'AliasUsers',
-                    path: 'users',
-                    meta: {
-                        title: 'aliasUsers',
-                        icon: 'group',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Alias/Card/AliasUsers.vue'),
-                },
-            ],
-        },
-    ],
-};
diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js
index 2af60c09c..89ba4078f 100644
--- a/src/router/modules/monitor.js
+++ b/src/router/modules/monitor.js
@@ -19,7 +19,7 @@ export default {
         {
             path: '',
             name: 'MonitorMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             props: (route) => ({ leftDrawer: route.name === 'MonitorClientsActions' }),
             redirect: { name: 'MonitorTickets' },
             children: [
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index bfa37fce5..77af812cf 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -19,7 +19,7 @@ export default {
         {
             path: '',
             name: 'OrderMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'OrderList' },
             children: [
                 {
diff --git a/src/router/modules/role.js b/src/router/modules/role.js
deleted file mode 100644
index 47cd10b18..000000000
--- a/src/router/modules/role.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import { RouterView } from 'vue-router';
-
-export default {
-    path: 'account/role',
-    name: 'Role',
-    meta: {
-        title: 'role',
-        icon: 'vn:greuge',
-        moduleName: 'Role',
-    },
-    component: RouterView,
-    redirect: { name: 'AccountRoles' },
-    menus: {
-        main: [],
-        card: ['RoleBasicData', 'SubRoles', 'InheritedRoles', 'RoleLog'],
-    },
-    children: [
-        {
-            name: 'RoleCard',
-            path: ':id',
-            component: () => import('src/pages/Account/Role/Card/RoleCard.vue'),
-            redirect: { name: 'RoleSummary' },
-            children: [
-                {
-                    name: 'RoleSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Role/Card/RoleSummary.vue'),
-                },
-                {
-                    name: 'RoleBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Role/Card/RoleBasicData.vue'),
-                },
-                {
-                    name: 'SubRoles',
-                    path: 'sub-roles',
-                    meta: {
-                        title: 'subRoles',
-                        icon: 'group',
-                    },
-                    component: () => import('src/pages/Account/Role/Card/SubRoles.vue'),
-                },
-
-                {
-                    name: 'InheritedRoles',
-                    path: 'inherited-roles',
-                    meta: {
-                        title: 'inheritedRoles',
-                        icon: 'account_tree',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Role/Card/InheritedRoles.vue'),
-                },
-                {
-                    name: 'RoleLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Account/Role/Card/RoleLog.vue'),
-                },
-            ],
-        },
-    ],
-};
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 9a7b16df3..a6c4f30a2 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -25,7 +25,7 @@ export default {
         {
             path: '/route',
             name: 'RouteMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'RouteList' },
             children: [
                 {
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 2eeec4b98..9cc6bcef1 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -18,7 +18,7 @@ export default {
         {
             path: '',
             name: 'ShelvingMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'ShelvingList' },
             children: [
                 {
diff --git a/src/router/modules/Supplier.js b/src/router/modules/supplier.js
similarity index 98%
rename from src/router/modules/Supplier.js
rename to src/router/modules/supplier.js
index c08fb5961..647f4bdd3 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/supplier.js
@@ -30,7 +30,7 @@ export default {
         {
             path: '',
             name: 'SupplierMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'SupplierList' },
             children: [
                 {
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6e407b88b..600b64c14 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -1,19 +1,12 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    name: 'Ticket',
-    path: '/ticket',
+const ticketCard = {
+    name: 'TicketCard',
+    path: ':id',
+    component: () => import('src/pages/Ticket/Card/TicketCard.vue'),
+    redirect: { name: 'TicketSummary' },
     meta: {
-        title: 'tickets',
-        icon: 'vn:ticket',
-        moduleName: 'Ticket',
-        keyBinding: 't',
-    },
-    component: RouterView,
-    redirect: { name: 'TicketMain' },
-    menus: {
-        main: ['TicketList', 'TicketAdvance', 'TicketWeekly', 'TicketFuture'],
-        card: [
+        menu: [
             'TicketBasicData',
             'TicketSale',
             'TicketLog',
@@ -32,21 +25,200 @@ export default {
             'TicketSms',
         ],
     },
+    children: [
+        {
+            path: 'summary',
+            name: 'TicketSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'TicketBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () =>
+                import('src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue'),
+        },
+        {
+            path: 'sale',
+            name: 'TicketSale',
+            meta: {
+                title: 'sale',
+                icon: 'vn:lines',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketSale.vue'),
+        },
+        {
+            path: 'request',
+            name: 'TicketPurchaseRequest',
+            meta: {
+                title: 'purchaseRequest',
+                icon: 'vn:buyrequest',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketPurchaseRequest.vue'),
+        },
+        {
+            path: 'tracking',
+            name: 'TicketTracking',
+            meta: {
+                title: 'tracking',
+                icon: 'vn:eye',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketTracking.vue'),
+        },
+        {
+            path: 'log',
+            name: 'TicketLog',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
+        },
+        {
+            path: 'observation',
+            name: 'TicketNotes',
+            meta: {
+                title: 'notes',
+                icon: 'vn:notes',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketNotes.vue'),
+        },
+        {
+            path: 'picture',
+            name: 'TicketPicture',
+            meta: {
+                title: 'pictures',
+                icon: 'vn:photo',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketPicture.vue'),
+        },
+        {
+            path: 'volume',
+            name: 'TicketVolume',
+            meta: {
+                title: 'volume',
+                icon: 'vn:volume',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketVolume.vue'),
+        },
+        {
+            path: 'expedition',
+            name: 'TicketExpedition',
+            meta: {
+                title: 'expedition',
+                icon: 'vn:package',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketExpedition.vue'),
+        },
+        {
+            path: 'service',
+            name: 'TicketService',
+            meta: {
+                title: 'services',
+                icon: 'vn:services',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketService.vue'),
+        },
+        {
+            path: 'package',
+            name: 'TicketPackage',
+            meta: {
+                title: 'packages',
+                icon: 'vn:bucket',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
+        },
+        {
+            path: 'components',
+            name: 'TicketComponents',
+            meta: {
+                title: 'components',
+                icon: 'vn:components',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketComponents.vue'),
+        },
+
+        {
+            path: 'sale-tracking',
+            name: 'TicketSaleTracking',
+            meta: {
+                title: 'saleTracking',
+                icon: 'assignment',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketSaleTracking.vue'),
+        },
+        {
+            path: 'dms',
+            name: 'TicketDms',
+            meta: {
+                title: 'dms',
+                icon: 'cloud_upload',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
+        },
+        {
+            path: 'boxing',
+            name: 'TicketBoxing',
+            meta: {
+                title: 'boxing',
+                icon: 'science',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
+        },
+        {
+            path: 'sms',
+            name: 'TicketSms',
+            meta: {
+                title: 'sms',
+                icon: 'sms',
+            },
+            component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
+        },
+    ],
+};
+
+export default {
+    name: 'Ticket',
+    path: '/ticket',
+    meta: {
+        title: 'tickets',
+        icon: 'vn:ticket',
+        moduleName: 'Ticket',
+        keyBinding: 't',
+        menu: ['TicketList', 'TicketAdvance', 'TicketWeekly', 'TicketFuture'],
+    },
+    component: RouterView,
+    redirect: { name: 'TicketMain' },
     children: [
         {
             name: 'TicketMain',
             path: '',
-            component: () => import('src/components/common/VnSectionMain.vue'),
-            redirect: { name: 'TicketList' },
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'TicketIndexMain' },
             children: [
                 {
-                    path: 'list',
-                    name: 'TicketList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
+                    path: '',
+                    name: 'TicketIndexMain',
+                    redirect: { name: 'TicketList' },
                     component: () => import('src/pages/Ticket/TicketList.vue'),
+                    children: [
+                        {
+                            name: 'TicketList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        ticketCard,
+                    ],
                 },
                 {
                     path: 'create',
@@ -86,170 +258,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'TicketCard',
-            path: ':id',
-            component: () => import('src/pages/Ticket/Card/TicketCard.vue'),
-            redirect: { name: 'TicketSummary' },
-            children: [
-                {
-                    path: 'summary',
-                    name: 'TicketSummary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketSummary.vue'),
-                },
-                {
-                    path: 'basic-data',
-                    name: 'TicketBasicData',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue'),
-                },
-                {
-                    path: 'sale',
-                    name: 'TicketSale',
-                    meta: {
-                        title: 'sale',
-                        icon: 'vn:lines',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketSale.vue'),
-                },
-                {
-                    path: 'request',
-                    name: 'TicketPurchaseRequest',
-                    meta: {
-                        title: 'purchaseRequest',
-                        icon: 'vn:buyrequest',
-                    },
-                    component: () =>
-                        import('src/pages/Ticket/Card/TicketPurchaseRequest.vue'),
-                },
-                {
-                    path: 'tracking',
-                    name: 'TicketTracking',
-                    meta: {
-                        title: 'tracking',
-                        icon: 'vn:eye',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketTracking.vue'),
-                },
-                {
-                    path: 'log',
-                    name: 'TicketLog',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
-                },
-                {
-                    path: 'observation',
-                    name: 'TicketNotes',
-                    meta: {
-                        title: 'notes',
-                        icon: 'vn:notes',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketNotes.vue'),
-                },
-                {
-                    path: 'picture',
-                    name: 'TicketPicture',
-                    meta: {
-                        title: 'pictures',
-                        icon: 'vn:photo',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketPicture.vue'),
-                },
-                {
-                    path: 'volume',
-                    name: 'TicketVolume',
-                    meta: {
-                        title: 'volume',
-                        icon: 'vn:volume',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketVolume.vue'),
-                },
-                {
-                    path: 'expedition',
-                    name: 'TicketExpedition',
-                    meta: {
-                        title: 'expedition',
-                        icon: 'vn:package',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketExpedition.vue'),
-                },
-                {
-                    path: 'service',
-                    name: 'TicketService',
-                    meta: {
-                        title: 'services',
-                        icon: 'vn:services',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketService.vue'),
-                },
-                {
-                    path: 'package',
-                    name: 'TicketPackage',
-                    meta: {
-                        title: 'packages',
-                        icon: 'vn:bucket',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
-                },
-                {
-                    path: 'components',
-                    name: 'TicketComponents',
-                    meta: {
-                        title: 'components',
-                        icon: 'vn:components',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketComponents.vue'),
-                },
-
-                {
-                    path: 'sale-tracking',
-                    name: 'TicketSaleTracking',
-                    meta: {
-                        title: 'saleTracking',
-                        icon: 'assignment',
-                    },
-                    component: () =>
-                        import('src/pages/Ticket/Card/TicketSaleTracking.vue'),
-                },
-                {
-                    path: 'dms',
-                    name: 'TicketDms',
-                    meta: {
-                        title: 'dms',
-                        icon: 'cloud_upload',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
-                },
-                {
-                    path: 'boxing',
-                    name: 'TicketBoxing',
-                    meta: {
-                        title: 'boxing',
-                        icon: 'science',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
-                },
-                {
-                    path: 'sms',
-                    name: 'TicketSms',
-                    meta: {
-                        title: 'sms',
-                        icon: 'sms',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
-                },
-            ],
-        },
     ],
 };
diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js
index dff693d2f..49272be1e 100644
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@@ -18,7 +18,7 @@ export default {
         {
             path: '',
             name: 'TravelMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'TravelList' },
             children: [
                 {
diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js
index 3556f215f..4a322d305 100644
--- a/src/router/modules/wagon.js
+++ b/src/router/modules/wagon.js
@@ -18,7 +18,7 @@ export default {
         {
             path: '/wagon',
             name: 'WagonMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'WagonList' },
             children: [
                 {
@@ -62,7 +62,7 @@ export default {
         {
             path: '/wagon/type',
             name: 'WagonTypeMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'WagonTypeList' },
             children: [
                 {
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 925019734..c732664ec 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -35,7 +35,7 @@ export default {
         {
             path: '',
             name: 'WorkerMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'WorkerList' },
             children: [
                 {
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index fc8161fb3..f400a708e 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -30,7 +30,7 @@ export default {
         {
             path: '/zone',
             name: 'ZoneMain',
-            component: () => import('src/components/common/VnSectionMain.vue'),
+            component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'ZoneList' },
             children: [
                 {
diff --git a/src/router/routes.js b/src/router/routes.js
index cced308b5..b9120f8c4 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -7,10 +7,9 @@ import worker from './modules/worker';
 import invoiceOut from './modules/invoiceOut';
 import invoiceIn from './modules/invoiceIn';
 import wagon from './modules/wagon';
-import supplier from './modules/Supplier';
+import supplier from './modules/supplier';
 import travel from './modules/travel';
 import department from './modules/department';
-import role from './modules/role';
 import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
@@ -21,7 +20,6 @@ import agency from 'src/router/modules/agency';
 import zone from 'src/router/modules/zone';
 import account from './modules/account';
 import monitor from 'src/router/modules/monitor';
-import mailAlias from './modules/mailAlias';
 
 const routes = [
     {
@@ -95,8 +93,6 @@ const routes = [
             ItemType,
             zone,
             account,
-            role,
-            mailAlias,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',
diff --git a/test/vitest/__tests__/stores/useStateQueryStore.spec.js b/src/stores/__tests__/useStateQueryStore.spec.js
similarity index 100%
rename from test/vitest/__tests__/stores/useStateQueryStore.spec.js
rename to src/stores/__tests__/useStateQueryStore.spec.js
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index d0a1c3a8f..e0d8b7929 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -51,10 +51,15 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         });
     }
 
+    function resetPagination(key) {
+        reset(key, ['skip', 'filter.skip', 'page']);
+    }
+
     return {
         get,
         set,
         clear,
         reset,
+        resetPagination,
     };
 });
diff --git a/test/cypress/integration/vnComponent/VnSearchBar.spec.js b/test/cypress/integration/vnComponent/VnSearchBar.spec.js
index b8621118c..885e5d6b3 100644
--- a/test/cypress/integration/vnComponent/VnSearchBar.spec.js
+++ b/test/cypress/integration/vnComponent/VnSearchBar.spec.js
@@ -7,10 +7,10 @@ describe('VnSearchBar', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit('#/customer/list');
+        cy.visit('#/account/list');
     });
 
-    it('should redirect to customer summary page', () => {
+    it('should redirect to account summary page', () => {
         searchAndCheck('1', employeeId);
         searchAndCheck('salesPerson', salesPersonId);
     });
@@ -20,7 +20,6 @@ describe('VnSearchBar', () => {
         checkTableLength(2);
 
         cy.clearSearchbar();
-
         cy.writeSearchbar('0{enter}');
         checkTableLength(0);
     });
diff --git a/vitest.config.js b/vitest.config.js
index ca9f6c1fe..a465f0e2d 100644
--- a/vitest.config.js
+++ b/vitest.config.js
@@ -13,7 +13,7 @@ export default defineConfig({
         include: [
             // Matches vitest tests in any subfolder of 'src' or into 'test/vitest/__tests__'
             // Matches all files with extension 'js', 'jsx', 'ts' and 'tsx'
-            'test/vitest/__tests__/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
+            'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
         ],
     },
     plugins: [