diff --git a/Jenkinsfile b/Jenkinsfile
index 1694aa29c..5f0b438c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,6 +26,7 @@ node {
        // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
         echo "NODE_NAME: ${env.NODE_NAME}"
         echo "WORKSPACE: ${env.WORKSPACE}"
+        echo "CHANGE_TARGET: ${env.CHANGE_TARGET}"
 
         configFileProvider([
             configFile(fileId: 'salix-front.properties',
diff --git a/package.json b/package.json
index e2570de47..65e5291a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.10.0",
+    "version": "25.12.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 7def6e94c..9c0fa6758 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -343,19 +343,29 @@ const updateData = async () => {
 
 const getMailStates = async (date) => {
     const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const year = date.getFullYear();
     const month = date.getMonth() + 1;
-    const prevMonth = month == 1 ? 12 : month - 1;
-    const params = {
-        month,
-        year: date.getFullYear(),
+
+    const getMonthStates = async (month, year) => {
+        return (await axios.get(url, { params: { month, year } })).data;
     };
 
-    const curMonthStates = (await axios.get(url, { params })).data;
-    const prevMonthStates = (
-        await axios.get(url, { params: { ...params, month: prevMonth } })
-    ).data;
+    const curMonthStates = await getMonthStates(month, year);
 
-    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
+    const prevMonthStates = await getMonthStates(
+        month === 1 ? 12 : month - 1,
+        month === 1 ? year - 1 : year,
+    );
+
+    const postMonthStates = await getMonthStates(
+        month === 12 ? 1 : month + 1,
+        month === 12 ? year + 1 : year,
+    );
+    workerTimeControlMails.value = [
+        ...curMonthStates,
+        ...prevMonthStates,
+        ...postMonthStates,
+    ];
 };
 
 const showWorkerTimeForm = (propValue, formType) => {
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 03013f011..089208453 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -9,22 +9,22 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
-const validAddresses = ref([]);
 const addresses = ref([]);
 
 const setFilteredAddresses = (data) => {
-    const validIds = new Set(validAddresses.value.map((item) => item.addressFk));
-    addresses.value = data.filter((address) => validIds.has(address.id));
+    addresses.value = data.map(({ address }) => address);
 };
 </script>
 
 <template>
     <FetchData
         url="RoadmapAddresses"
+        :filter="{
+            include: { relation: 'address' },
+        }"
         auto-load
-        @on-fetch="(data) => (validAddresses = data)"
+        @on-fetch="setFilteredAddresses"
     />
-    <FetchData url="Addresses" auto-load @on-fetch="setFilteredAddresses" />
     <FormModel auto-load model="Zone">
         <template #form="{ data, validate }">
             <VnRow>
@@ -125,7 +125,6 @@ const setFilteredAddresses = (data) => {
                     map-options
                     :rules="validate('data.addressFk')"
                     :filter-options="['id']"
-                    :where="filterWhere"
                 />
             </VnRow>
             <VnRow>