diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index ccf87c6d6..4e90245d6 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -51,10 +51,6 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-    staticParams: {
-        type: Array,
-        default: () => [],
-    },
     exprBuilder: {
         type: Function,
         default: null,
diff --git a/src/pages/Item/ItemType/Card/ItemTypeSummary.vue b/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
index c51d59e13..9ba774ca4 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
@@ -78,29 +78,32 @@ async function setItemTypeData(data) {
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" />
                 </router-link>
-                <VnLv :label="t('summary.id')" :value="itemType.id" />
-                <VnLv :label="t('shared.code')" :value="itemType.code" />
-                <VnLv :label="t('shared.name')" :value="itemType.name" />
-                <VnLv :label="t('shared.worker')">
+                <VnLv :label="t('itemType.summary.id')" :value="itemType.id" />
+                <VnLv :label="t('itemType.shared.code')" :value="itemType.code" />
+                <VnLv :label="t('itemType.shared.name')" :value="itemType.name" />
+                <VnLv :label="t('itemType.shared.worker')">
                     <template #value>
                         <span class="link">{{ itemType.worker?.firstName }}</span>
                         <WorkerDescriptorProxy :id="itemType.worker?.id" />
                     </template>
                 </VnLv>
-                <VnLv :label="t('shared.category')" :value="itemType.category?.name" />
                 <VnLv
-                    :label="t('shared.temperature')"
+                    :label="t('itemType.shared.category')"
+                    :value="itemType.category?.name"
+                />
+                <VnLv
+                    :label="t('itemType.shared.temperature')"
                     :value="itemType.temperature?.name"
                 />
-                <VnLv :label="t('summary.life')" :value="itemType.life" />
-                <VnLv :label="t('summary.promo')" :value="itemType.promo" />
+                <VnLv :label="t('itemType.summary.life')" :value="itemType.life" />
+                <VnLv :label="t('itemType.summary.promo')" :value="itemType.promo" />
                 <VnLv
-                    :label="t('summary.itemPackingType')"
+                    :label="t('itemType.summary.itemPackingType')"
                     :value="itemType.itemPackingType?.description"
                 />
                 <VnLv
                     class="large-label"
-                    :label="t('summary.isUnconventionalSize')"
+                    :label="t('itemType.summary.isUnconventionalSize')"
                     :value="itemType.isUnconventionalSize"
                 />
             </QCard>
diff --git a/src/pages/Item/ItemType/locale/en.yml b/src/pages/Item/ItemType/locale/en.yml
index 575d5e402..99c6791f2 100644
--- a/src/pages/Item/ItemType/locale/en.yml
+++ b/src/pages/Item/ItemType/locale/en.yml
@@ -1,16 +1,17 @@
-shared:
-    code: Code
-    name: Name
-    worker: Worker
-    category: Category
-    temperature: Temperature
-    life: Life
-    itemPackingType: Item packing type
-    maxRefs: Maximum references
-    fragile: Fragile
-summary:
-    id: id
-    life: Life
-    promo: Promo
-    itemPackingType: Item packing type
-    isUnconventionalSize: Is unconventional size
+itemType:
+    shared:
+        code: Code
+        name: Name
+        worker: Worker
+        category: Category
+        temperature: Temperature
+        life: Life
+        itemPackingType: Item packing type
+        maxRefs: Maximum references
+        fragile: Fragile
+    summary:
+        id: id
+        life: Life
+        promo: Promo
+        itemPackingType: Item packing type
+        isUnconventionalSize: Is unconventional size
diff --git a/src/pages/Item/ItemType/locale/es.yml b/src/pages/Item/ItemType/locale/es.yml
index 93f8b0d0e..c91fb4058 100644
--- a/src/pages/Item/ItemType/locale/es.yml
+++ b/src/pages/Item/ItemType/locale/es.yml
@@ -1,16 +1,17 @@
-shared:
-    code: Código
-    name: Nombre
-    worker: Trabajador
-    category: Reino
-    temperature: Temperatura
-    life: Vida
-    itemPackingType: Tipo de embalaje
-    maxRefs: Referencias máximas
-    fragile: Frágil
-summary:
-    id: id
-    life: Vida
-    promo: Promoción
-    itemPackingType: Tipo de embalaje
-    isUnconventionalSize: Es de tamaño poco convencional
+itemType:
+    shared:
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura
+        life: Vida
+        itemPackingType: Tipo de embalaje
+        maxRefs: Referencias máximas
+        fragile: Frágil
+    summary:
+        id: id
+        life: Vida
+        promo: Promoción
+        itemPackingType: Tipo de embalaje
+        isUnconventionalSize: Es de tamaño poco convencional
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 2fe4fcddc..eb03a4927 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref, onBeforeMount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -46,7 +46,7 @@ const userParams = {
     from: null,
     to: null,
 };
-onMounted(() => {
+onBeforeMount(() => {
     initializeFromQuery();
     stateStore.rightDrawer = true;
     if (!route.query.createForm) return;
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 6d5b37096..923a72391 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -52,6 +52,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 :last-day="lastDay"
                 :events="events"
                 v-model:formModeName="formModeName"
+                @open-zone-form="openForm"
             />
         </QScrollArea>
     </QDrawer>
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index da1c0cf71..bb8c15934 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -11,10 +11,6 @@ import { dashIfEmpty } from 'src/filters';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
-const formModeName = defineModel('formModeName', {
-    type: String,
-    required: true,
-});
 const props = defineProps({
     firstDay: {
         type: Date,
@@ -31,8 +27,18 @@ const props = defineProps({
         required: true,
         default: () => [],
     },
+    formModeName: {
+        type: String,
+        required: true,
+        default: 'include',
+    },
 });
 
+const formName = computed({
+    get: () => props.formModeName,
+    set: (value) => emit('update:formModeName', value),
+});
+const emit = defineEmits(['openZoneForm', 'update:formModeName']);
 const { t } = useI18n();
 const route = useRoute();
 const weekdayStore = useWeekdayStore();
@@ -80,6 +86,15 @@ const deleteEvent = async (id) => {
     await fetchData();
 };
 
+const openInclusionForm = (event) => {
+    formName.value = 'include';
+    emit('openZoneForm', {
+        date: event.dated,
+        event,
+        isNewMode: false,
+    });
+};
+
 onMounted(async () => {
     weekdayStore.initStore();
 });
@@ -92,13 +107,13 @@ onMounted(async () => {
                 t('eventsPanel.editMode')
             }}</span>
             <QRadio
-                v-model="formModeName"
+                v-model="formName"
                 dense
                 val="include"
                 :label="t('eventsPanel.include')"
             />
             <QRadio
-                v-model="formModeName"
+                v-model="formName"
                 dense
                 val="exclude"
                 :label="t('eventsPanel.exclude')"