diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 3288616fb..07f4426ba 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -44,9 +44,8 @@ const onFilterTravelSelected = (formData, id) => {
         auto-load
     />
     <FormModel
-        :url="`Entries/${route.params.id}`"
         :url-update="`Entries/${route.params.id}`"
-        model="entry"
+        model="Entry"
         auto-load
         :clear-store-on-unmount="false"
     >
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 436f5b9cd..3f2596338 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -2,11 +2,13 @@
 import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
 import EntryFilter from '../EntryFilter.vue';
+import filter from './EntryFilter.js';
 </script>
 <template>
     <VnCard
         data-key="Entry"
         base-url="Entries"
+        :filter="filter"
         :descriptor="EntryDescriptor"
         :filter-panel="EntryFilter"
         search-data-key="EntryList"
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index d66185aa9..794f791ae 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -1,15 +1,15 @@
 <script setup>
-import { ref, computed, watch, onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import { getUrl } from 'src/composables/getUrl';
+import filter from './EntryFilter.js';
 
 const $props = defineProps({
     id: {
@@ -25,50 +25,6 @@ const { openReport } = usePrintService();
 const entryDescriptorRef = ref(null);
 const url = ref();
 
-const entryFilter = {
-    include: [
-        {
-            relation: 'travel',
-            scope: {
-                fields: [
-                    'id',
-                    'landed',
-                    'shipped',
-                    'agencyModeFk',
-                    'warehouseOutFk',
-                    'daysInForward',
-                ],
-                include: [
-                    {
-                        relation: 'agency',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'warehouseOut',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'warehouseIn',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                ],
-            },
-        },
-        {
-            relation: 'supplier',
-            scope: {
-                fields: ['id', 'nickname'],
-            },
-        },
-    ],
-};
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -76,10 +32,6 @@ onMounted(async () => {
     url.value = await getUrl('');
 });
 
-const data = ref(useCardDescription());
-const setData = (entity) =>
-    (data.value = useCardDescription(entity.supplier?.nickname, entity.id));
-
 const getEntryRedirectionFilter = (entry) => {
     let entryTravel = entry && entry.travel;
 
@@ -104,8 +56,6 @@ const getEntryRedirectionFilter = (entry) => {
 const showEntryReport = () => {
     openReport(`Entries/${route.params.id}/entry-order-pdf`);
 };
-
-watch;
 </script>
 
 <template>
@@ -113,11 +63,9 @@ watch;
         ref="entryDescriptorRef"
         module="Entry"
         :url="`Entries/${entityId}`"
-        :filter="entryFilter"
-        :title="data.title"
-        :subtitle="data.subtitle"
-        @on-fetch="setData"
-        data-key="entry"
+        :filter="filter"
+        title="supplier.nickname"
+        data-key="Entry"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">
@@ -165,7 +113,7 @@ watch;
         <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
-                    :to="`/supplier/${entity.supplier.id}`"
+                    :to="`/supplier/${entity.supplier?.id}`"
                     size="md"
                     icon="vn:supplier"
                     color="primary"
diff --git a/src/pages/Entry/Card/EntryFilter.js b/src/pages/Entry/Card/EntryFilter.js
new file mode 100644
index 000000000..3ff62cf27
--- /dev/null
+++ b/src/pages/Entry/Card/EntryFilter.js
@@ -0,0 +1,43 @@
+export default {
+    include: [
+        {
+            relation: 'travel',
+            scope: {
+                fields: [
+                    'id',
+                    'landed',
+                    'shipped',
+                    'agencyModeFk',
+                    'warehouseOutFk',
+                    'daysInForward',
+                ],
+                include: [
+                    {
+                        relation: 'agency',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseOut',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseIn',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                ],
+            },
+        },
+        {
+            relation: 'supplier',
+            scope: {
+                fields: ['id', 'nickname'],
+            },
+        },
+    ],
+};