diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 275d919d6..8f834b426 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -57,7 +57,7 @@ defineExpose({ getData });
 onBeforeMount(async () => {
     arrayData = useArrayData($props.dataKey, {
         url: $props.url,
-        filter: $props.filter,
+        userFilter: $props.filter,
         skip: 0,
         oneRecord: true,
     });
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 5b1d6e726..ec6289a67 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -18,7 +18,12 @@ import VnInput from 'components/common/VnInput.vue';
 
 const emit = defineEmits(['onFetch']);
 
-const $attrs = useAttrs();
+const originalAttrs = useAttrs();
+
+const $attrs = computed(() => {
+    const { style, ...rest } = originalAttrs;
+    return rest;
+});
 
 const isRequired = computed(() => {
     return Object.keys($attrs).includes('required')
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index f55b0c48b..3749b0c7c 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -86,7 +86,7 @@ onMounted(async () => {
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.zone')">
+            <VnLv v-if="entity.ticket?.zone?.id" :label="t('claim.zone')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticket?.zone?.name }}
@@ -98,11 +98,10 @@ onMounted(async () => {
                 :label="t('claim.province')"
                 :value="entity.ticket?.address?.province?.name"
             />
-            <VnLv :label="t('claim.ticketId')">
+            <VnLv v-if="entity.ticketFk" :label="t('claim.ticketId')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticketFk }}
-
                         <TicketDescriptorProxy :id="entity.ticketFk" />
                     </span>
                 </template>
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 134ee33ab..cc6e33779 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, useAttrs } from 'vue';
 import { useRoute } from 'vue-router';
 import { useState } from 'src/composables/useState';
 import VnNotes from 'src/components/ui/VnNotes.vue';
@@ -7,6 +7,7 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
 const route = useRoute();
 const state = useState();
 const user = state.getUser();
+const $attrs = useAttrs();
 
 const $props = defineProps({
     id: { type: [Number, String], default: null },
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index ba74ba212..c05583314 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -131,7 +131,7 @@ const STATE_COLOR = {
         prefix="claim"
         :array-data-props="{
             url: 'Claims/filter',
-            order: ['cs.priority ASC', 'created ASC'],
+            order: 'cs.priority ASC, created ASC',
         }"
     >
         <template #advanced-menu>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index be35750a9..680f6e773 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -43,10 +43,9 @@ const addToOrder = async () => {
     );
 
     state.set('orderTotal', orderTotal);
-    const rows = orderData.value.rows.push(...items) || [];
     state.set('Order', {
         ...orderData.value,
-        rows,
+        items,
     });
     notify(t('globals.dataSaved'), 'positive');
     emit('added', -totalQuantity(items));
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 5206f1e62..15d335ac8 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -1,5 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
+import { computed, ref } from 'vue';
+import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -7,10 +9,33 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
+
+const agencyFilter = {
+    fields: ['id', 'name'],
+    order: 'name ASC',
+    limit: 30,
+};
+const agencyOptions = ref([]);
+const validAddresses = ref([]);
+
+const filterWhere = computed(() => ({
+    id: { inq: validAddresses.value.map((item) => item.addressFk) },
+}));
 </script>
 
 <template>
-    <FormModel :url="`Zones/${$route.params.id}`" auto-load model="zone">
+    <FetchData
+        :filter="agencyFilter"
+        @on-fetch="(data) => (agencyOptions = data)"
+        auto-load
+        url="AgencyModes/isActive"
+    />
+    <FetchData
+        url="RoadmapAddresses"
+        auto-load
+        @on-fetch="(data) => (validAddresses = data)"
+    />
+    <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
@@ -109,6 +134,8 @@ const { t } = useI18n();
                     hide-selected
                     map-options
                     :rules="validate('data.addressFk')"
+                    :filter-options="['id']"
+                    :where="filterWhere"
                 />
             </VnRow>
             <VnRow>
diff --git a/src/pages/Zone/Card/ZoneSearchbar.vue b/src/pages/Zone/Card/ZoneSearchbar.vue
index f7a59e97f..d1188a1e8 100644
--- a/src/pages/Zone/Card/ZoneSearchbar.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@@ -22,15 +22,50 @@ const exprBuilder = (param, value) => {
             return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
     }
 };
+
+const tableFilter = {
+    include: [
+        {
+            relation: 'agencyMode',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+        {
+            relation: 'address',
+            scope: {
+                fields: ['id', 'nickname', 'provinceFk', 'postalCode'],
+                include: [
+                    {
+                        relation: 'province',
+                        scope: {
+                            fields: ['id', 'name'],
+                        },
+                    },
+                    {
+                        relation: 'postcode',
+                        scope: {
+                            fields: ['code', 'townFk'],
+                            include: {
+                                relation: 'town',
+                                scope: {
+                                    fields: ['id', 'name'],
+                                },
+                            },
+                        },
+                    },
+                ],
+            },
+        },
+    ],
+};
 </script>
 
 <template>
     <VnSearchbar
         data-key="ZonesList"
         url="Zones"
-        :filter="{
-            include: { relation: 'agencyMode', scope: { fields: ['name'] } },
-        }"
+        :filter="tableFilter"
         :expr-builder="exprBuilder"
         :label="t('list.searchZone')"
         :info="t('list.searchInfo')"
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index e4a1774fe..1fa539c91 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -4,7 +4,7 @@ import { useRouter } from 'vue-router';
 import { computed, ref } from 'vue';
 import axios from 'axios';
 
-import { toCurrency } from 'src/filters';
+import { dashIfEmpty, toCurrency } from 'src/filters';
 import { toTimeFormat } from 'src/filters/date';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
@@ -17,7 +17,6 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import ZoneFilterPanel from './ZoneFilterPanel.vue';
 import ZoneSearchbar from './Card/ZoneSearchbar.vue';
-import FetchData from 'src/components/FetchData.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -26,7 +25,6 @@ const { viewSummary } = useSummaryDialog();
 const { openConfirmationModal } = useVnConfirm();
 const tableRef = ref();
 const warehouseOptions = ref([]);
-const validAddresses = ref([]);
 
 const tableFilter = {
     include: [
@@ -161,30 +159,18 @@ const handleClone = (id) => {
     openConfirmationModal(
         t('list.confirmCloneTitle'),
         t('list.confirmCloneSubtitle'),
-        () => clone(id)
+        () => clone(id),
     );
 };
 
-function showValidAddresses(row) {
-    if (row.addressFk) {
-        const isValid = validAddresses.value.some(
-            (address) => address.addressFk === row.addressFk
-        );
-        if (isValid)
-            return `${row.address?.nickname},
-            ${row.address?.postcode?.town?.name} (${row.address?.province?.name})`;
-        else return '-';
-    }
-    return '-';
+function formatRow(row) {
+    if (!row?.address) return '-';
+    return dashIfEmpty(`${row?.address?.nickname},
+            ${row?.address?.postcode?.town?.name} (${row?.address?.province?.name})`);
 }
 </script>
 
 <template>
-    <FetchData
-        url="RoadmapAddresses"
-        auto-load
-        @on-fetch="(data) => (validAddresses = data)"
-    />
     <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
@@ -207,7 +193,7 @@ function showValidAddresses(row) {
         :right-search="false"
     >
         <template #column-addressFk="{ row }">
-            {{ showValidAddresses(row) }}
+            {{ dashIfEmpty(formatRow(row)) }}
         </template>
         <template #more-create-dialog="{ data }">
             <VnSelect