diff --git a/src/components/FilterComponent.vue b/src/components/FilterComponent.vue
index 511ff04..1903c45 100644
--- a/src/components/FilterComponent.vue
+++ b/src/components/FilterComponent.vue
@@ -109,6 +109,8 @@ export default {
       const minDateCET = minDate.value ? DateTime.fromJSDate(minDate.value).setZone('Europe/Paris').toFormat('yyyy-MM-dd\'T\'HH:mm:ss') : null;
       const maxDateCET = maxDate.value ? DateTime.fromJSDate(maxDate.value).setZone('Europe/Paris').toFormat('yyyy-MM-dd\'T\'HH:mm:ss') : null;
 
+
+
       vespaStore.applyFilters({
         municipalities: selectedMunicipalities.value.length > 0 ? selectedMunicipalities.value : [],
         provinces: selectedProvinces.value.length > 0 ? selectedProvinces.value : [],
@@ -119,6 +121,7 @@ export default {
         max_observation_date: maxDateCET,
         visible: visibleActief.value
       });
+      
     }, 300);
 
     const toggleMenu1 = () => {
@@ -153,9 +156,30 @@ export default {
 
     watch([selectedMunicipalities, selectedProvinces, selectedNestType, selectedNestStatus, anbAreasActief, selectedObservationStart, selectedObservationEnd, visibleActief], () => {
       emitFilterUpdate();
-    }, { deep: true });
+    }, { deep: true});
+    
+    watch(() => vespaStore.filters, (newFilters, oldFilters) => {
+      const hasChanged = JSON.stringify(newFilters) !== JSON.stringify(oldFilters);
+      
+      if (hasChanged) {
+        selectedMunicipalities.value = newFilters.municipalities || [];
+        selectedProvinces.value = newFilters.provinces || [];
+        anbAreasActief.value = newFilters.anbAreasActief || null;
+        selectedNestType.value = newFilters.nestType || [];
+        selectedNestStatus.value = newFilters.nestStatus || [];
+        minDate.value = newFilters.min_observation_date ? new Date(newFilters.min_observation_date) : null;
+        maxDate.value = newFilters.max_observation_date ? new Date(newFilters.max_observation_date) : null;
+      }
+    }, { immediate: true, deep: true });
 
     onMounted(async () => {
+      selectedMunicipalities.value = vespaStore.filters.municipalities || [];
+      selectedProvinces.value = vespaStore.filters.provinces || [];
+      anbAreasActief.value = vespaStore.filters.anbAreasActief;
+      selectedNestType.value = vespaStore.filters.nestType || [];
+      selectedNestStatus.value = vespaStore.filters.nestStatus || [];
+      minDate.value = vespaStore.filters.min_observation_date ? new Date(vespaStore.filters.min_observation_date) : new Date(new Date().getFullYear(), 3, 1);
+      maxDate.value = vespaStore.filters.max_observation_date ? new Date(vespaStore.filters.max_observation_date) : null;
       if (!vespaStore.municipalitiesFetched) await vespaStore.fetchMunicipalities();
       if (!vespaStore.provincesFetched) await vespaStore.fetchProvinces();
     });
diff --git a/src/components/MapPage.vue b/src/components/MapPage.vue
index 5499de2..249edd6 100644
--- a/src/components/MapPage.vue
+++ b/src/components/MapPage.vue
@@ -81,7 +81,7 @@ export default {
             map.value.setView([result.lat, result.lon], 16);
           } else {
             // Handle case when address is not found
-            console.log('Adres niet gevonden');
+
           }
         } catch (error) {
           console.error('Error searching address:', error);
@@ -143,6 +143,7 @@ export default {
 
     const updateMarkers = debounce(async () => {
       if (isFetchingGeoJson.value) return; // Prevent multiple calls
+
       isFetchingGeoJson.value = true;
 
       try {
@@ -182,6 +183,7 @@ export default {
       } finally {
         isFetchingGeoJson.value = false;
         isMapLoading.value = false;
+        vespaStore.getObservations(1, 25).catch(error => console.error('Error fetching observations:', error));
       }
     }, 300);
 
@@ -219,6 +221,7 @@ export default {
       () => vespaStore.filters,
       (newFilters) => {
         filtersUpdated.value = true;
+
         clearAndUpdateMarkers();
       },
       { deep: true }
@@ -236,7 +239,6 @@ export default {
     onMounted(async () => {
       if (!vespaStore.municipalitiesFetched) await vespaStore.fetchMunicipalities();
       if (!vespaStore.provincesFetched) await vespaStore.fetchProvinces();
-
       vespaStore.markerClusterGroup = L.markerClusterGroup({
         spiderfyOnMaxZoom: false,
         showCoverageOnHover: true,
@@ -300,11 +302,12 @@ export default {
       }
 
       vespaStore.map = map.value;
-      if (vespaStore.lastAppliedFilters === null || vespaStore.lastAppliedFilters === 'null') {
-        vespaStore.setLastAppliedFilters();
-      }
+      // if (vespaStore.lastAppliedFilters === null || vespaStore.lastAppliedFilters === 'null') {
+      //   vespaStore.setLastAppliedFilters();
+      // }
       updateMarkers();
-      vespaStore.getObservations(1, 25).catch(error => console.error('Error fetching observations:', error));
+
+
     });
 
     return {
diff --git a/src/components/NavbarComponent.vue b/src/components/NavbarComponent.vue
index 7cc6449..df5891d 100644
--- a/src/components/NavbarComponent.vue
+++ b/src/components/NavbarComponent.vue
@@ -8,25 +8,27 @@
       <div class="d-flex align-items-center">
         <!-- View Mode Toggle -->
         <div class="btn-group me-2" role="group">
-          <router-link to="/map" class="btn btn-outline-dark" active-class="active" aria-current="page">Map</router-link>
+          <router-link to="/map" class="btn btn-outline-dark" active-class="active"
+            aria-current="page">Map</router-link>
           <router-link to="/table" class="btn btn-outline-dark" active-class="active">Tabel</router-link>
         </div>
 
         <!-- Export Toggle (Hidden on Medium Devices and below) -->
         <div class="btn-group me-2 d-md-inline-flex">
-          <button type="button" class="btn btn-outline-dark dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+          <button type="button" class="btn btn-outline-dark dropdown-toggle" data-bs-toggle="dropdown"
+            aria-expanded="false">
             Export
           </button>
           <ul class="dropdown-menu">
             <li><button class="dropdown-item" @click="exportData('csv')">CSV</button></li>
-            <li><button class="dropdown-item" @click="exportData('json')">JSON</button></li>
           </ul>
         </div>
 
         <!-- User Login/Logout -->
         <span v-if="isLoggedIn && !loadingAuth" class="navbar-text">
           <div class="btn-group">
-            <button type="button" class="btn btn-outline-dark dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+            <button type="button" class="btn btn-outline-dark dropdown-toggle" data-bs-toggle="dropdown"
+              aria-expanded="false">
               {{ username }}
             </button>
             <ul class="dropdown-menu dropdown-menu-end">
@@ -35,12 +37,14 @@
             </ul>
           </div>
         </span>
-        <router-link v-if="!isLoggedIn && !loadingAuth" to="/login" class="btn btn-outline-dark" active-class="active">Inloggen</router-link>
+        <router-link v-if="!isLoggedIn && !loadingAuth" to="/login" class="btn btn-outline-dark"
+          active-class="active">Inloggen</router-link>
         <span v-if="loadingAuth" class="navbar-text">Loading...</span> <!-- Placeholder while loading -->
       </div>
     </div>
   </nav>
-  <ModalMessage :title="modalTitle" :message="modalMessage" :isVisible="isModalVisible" @close="isModalVisible = false" />
+  <ModalMessage :title="modalTitle" :message="modalMessage" :isVisible="isModalVisible"
+    @close="isModalVisible = false" />
 </template>
 
 <script>
diff --git a/src/components/ObservationDetailsComponent.vue b/src/components/ObservationDetailsComponent.vue
index 0934e8d..7f8cd84 100644
--- a/src/components/ObservationDetailsComponent.vue
+++ b/src/components/ObservationDetailsComponent.vue
@@ -51,6 +51,22 @@
                     <div id="eradication" class="accordion-collapse collapse" aria-labelledby="eradication-header"
                         data-bs-parent="#sections">
                         <div class="accordion-body">
+                            <div class="row mb-2">
+                                <label class="col-4 col-form-label">Resultaat</label>
+                                <div class="col-8">
+                                    <select v-if="selectedObservation.eradication_result !== undefined"
+                                        v-model="editableObservation.eradication_result" class="form-select"
+                                        :class="{ 'is-invalid': eradicationResultError }" :disabled="!canEdit">
+                                        <option :value="null">Geen</option>
+                                        <option v-for="(label, value) in eradicationResultEnum" :key="value"
+                                            :value="value">{{ label
+                                            }}</option>
+                                    </select>
+                                    <div v-if="eradicationResultError" class="invalid-feedback">
+                                        {{ eradicationResultError }}
+                                    </div>
+                                </div>
+                            </div>
                             <div class="row mb-2">
                                 <label class="col-4 col-form-label">Datum</label>
                                 <div class="col-8">
@@ -86,22 +102,6 @@
                                         :class="{ 'form-control-plaintext': !canEdit }" />
                                 </div>
                             </div>
-                            <div class="row mb-2">
-                                <label class="col-4 col-form-label">Resultaat</label>
-                                <div class="col-8">
-                                    <select v-if="selectedObservation.eradication_result !== undefined"
-                                        v-model="editableObservation.eradication_result" class="form-select"
-                                        :class="{ 'is-invalid': eradicationResultError }" :disabled="!canEdit">
-                                        <option :value="null">Geen</option>
-                                        <option v-for="(label, value) in eradicationResultEnum" :key="value"
-                                            :value="value">{{ label
-                                            }}</option>
-                                    </select>
-                                    <div v-if="eradicationResultError" class="invalid-feedback">
-                                        {{ eradicationResultError }}
-                                    </div>
-                                </div>
-                            </div>
                             <div v-if="isLoggedIn" class="row mb-2">
                                 <label class="col-4 col-form-label">Methode</label>
                                 <div class="col-8">
@@ -141,7 +141,7 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="row mb-2">
+                            <div v-if="isLoggedIn" class="row mb-2">
                                 <label class="col-4 col-form-label">Problemen</label>
                                 <div class="col-8">
                                     <select v-if="selectedObservation.eradication_problems !== undefined"
@@ -154,7 +154,7 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="row mb-2">
+                            <div v-if="isLoggedIn" class="row mb-2">
                                 <label class="col-4 col-form-label">Opmerkingen</label>
                                 <div class="col-8">
                                     <textarea v-if="selectedObservation.eradication_notes !== undefined"
@@ -278,14 +278,14 @@
                                         </p>
                                     </div>
                                 </div>
-                                <div class="row mb-2">
+                                <div v-if="isLoggedIn" class="row mb-2">
                                     <label class="col-4 col-form-label">Opmerking validator</label>
                                     <div class="col-8">
                                         <p class="form-control-plaintext">{{ selectedObservation.wn_notes }}</p>
                                     </div>
                                 </div>
                             </div>
-                            <div class="row mb-2">
+                            <div v-if="isLoggedIn" class="row mb-2">
                                 <div class="col-8 offset-4">
                                     <div class="form-check form-switch">
                                         <input v-if="selectedObservation.public_domain !== undefined"
@@ -468,7 +468,8 @@ export default {
         const eradicationResultEnum = {
             "successful": "Succesvol behandeld",
             "unsuccessful": "Niet succesvol behandeld",
-            "untreated": "Niet behandeld",
+            "untreated": "Niet behandeld want andere soort",
+            "untreatable": "Onbehandelbaar (bv. te hoog, inactief)",
             "unknown": "Onbekend"
         };
 
diff --git a/src/components/TableViewPage.vue b/src/components/TableViewPage.vue
index bd85a43..f601592 100644
--- a/src/components/TableViewPage.vue
+++ b/src/components/TableViewPage.vue
@@ -120,6 +120,7 @@ export default {
         sortBy.value = field;
         sortOrder.value = 'asc';
       }
+
       vespaStore.getObservations(page.value, pageSize.value, sortBy.value, sortOrder.value);
     };
 
@@ -129,6 +130,7 @@ export default {
       } else if (direction === 'prev' && previousPage.value) {
         page.value--;
       }
+
       vespaStore.getObservations(page.value, pageSize.value, sortBy.value, sortOrder.value);
     };
 
@@ -164,6 +166,10 @@ export default {
       const lastAppliedFilters = vespaStore.lastAppliedFilters;
 
       if (currentFilters !== lastAppliedFilters) {
+
+
+
+        //vespaStore.setLastAppliedFilters();
         vespaStore.getObservations(page.value, pageSize.value, sortBy.value, sortOrder.value).then(() => {
           vespaStore.getObservationsGeoJson();
         });
@@ -174,13 +180,20 @@ export default {
       if (!vespaStore.municipalitiesFetched) await vespaStore.fetchMunicipalities();
       if (!vespaStore.provincesFetched) await vespaStore.fetchProvinces();
 
-      if (vespaStore.lastAppliedFilters === null || vespaStore.lastAppliedFilters === 'null') {
-        vespaStore.setLastAppliedFilters();
-      }
+
+      // if (vespaStore.lastAppliedFilters === null || vespaStore.lastAppliedFilters === 'null') {
+      //   console.log("set hier?")
+      //   vespaStore.setLastAppliedFilters();
+      // }
 
       // Avoid calling getObservations if data is already loaded with the same filters
       if (vespaStore.table_observations.length === 0 || JSON.stringify(vespaStore.filters) !== JSON.stringify(vespaStore.lastAppliedFilters)) {
+
+
+
+        //vespaStore.setLastAppliedFilters();
         vespaStore.getObservations(page.value, pageSize.value, sortBy.value, sortOrder.value);
+        vespaStore.getObservationsGeoJson();
       }
     });
 
diff --git a/src/stores/vespaStore.js b/src/stores/vespaStore.js
index 73697d6..d3f2a07 100644
--- a/src/stores/vespaStore.js
+++ b/src/stores/vespaStore.js
@@ -176,6 +176,8 @@ export const useVespaStore = defineStore('vespaStore', {
         },
         async applyFilters(filters) {
             this.filters = { ...this.filters, ...filters };
+            // await this.getObservations();
+            // await this.getObservationsGeoJson();
             //await this.getObservations();
         },
         async fetchProvinces() {
@@ -296,11 +298,11 @@ export const useVespaStore = defineStore('vespaStore', {
             }
             if (observation.eradication_date) {
                 observation.eradication_date = this.formatDateWithoutTime(observation.eradication_date);
-                console.log("transformed date:")
-                console.log(observation.eradication_date);
+
+
             }
-            console.log("the observation erad date is");
-            console.log(observation.eradication_date);
+
+
             try {
                 const response = await ApiService.patch(`/observations/${observation.id}/`, observation);
                 if (response.status === 200) {
diff --git a/vespadb/observations/admin.py b/vespadb/observations/admin.py
index e37b68c..037cc2e 100644
--- a/vespadb/observations/admin.py
+++ b/vespadb/observations/admin.py
@@ -113,6 +113,7 @@ class ObservationAdmin(gis_admin.GISModelAdmin):
         "eradicator_name",
         "reserved_by",
         "modified_by",
+        "modified_datetime",
         "public_domain",
         "reserved_datetime",
     )
@@ -132,6 +133,8 @@ class ObservationAdmin(gis_admin.GISModelAdmin):
         "municipality",
         "anb",
         "reserved_by",
+        "modified_datetime",
+        "modified_by",
         "created_by",
         "modified_by",
         ObserverReceivedEmailFilter,
@@ -164,7 +167,7 @@ class ObservationAdmin(gis_admin.GISModelAdmin):
         "municipality",
     )
 
-    def get_readonly_fields(self, obj: Observation | None = None) -> list[str]:
+    def get_readonly_fields(self, request: HttpRequest, obj: Observation | None = None) -> list[str]:
         """."""
         if obj:  # editing an existing object
             return [*self.readonly_fields, "location"]
diff --git a/vespadb/observations/serializers.py b/vespadb/observations/serializers.py
index 25442dd..82e19bd 100644
--- a/vespadb/observations/serializers.py
+++ b/vespadb/observations/serializers.py
@@ -2,13 +2,12 @@
 
 import logging
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Any
 
 from django.conf import settings
 from django.contrib.gis.geos import GEOSGeometry, Point
 from django.core.exceptions import ValidationError
-from django.utils import timezone
 from rest_framework import serializers
 from rest_framework.request import Request
 
@@ -73,6 +72,7 @@
     "created_by",
     "wn_modified_datetime",
     "wn_created_datetime",
+    "wn_validation_status",
     "images",
     "reserved_by",
     "reserved_datetime",
@@ -141,7 +141,7 @@ class Meta:
             "location": {"help_text": "Geographical location of the observation as a point."},
             "source": {"help_text": "Source of the observation."},
             "wn_notes": {"help_text": "Notes about the observation."},
-            "wn_admin_notes": {"help_text": "Admin notes about the observation."},
+            "wn_admin_notes": {"write_only": True},
             "wn_validation_status": {"help_text": "Validation status of the observation."},
             "nest_height": {"help_text": "Height of the nest."},
             "nest_size": {"help_text": "Size of the nest."},
@@ -233,6 +233,7 @@ def to_representation(self, instance: Observation) -> dict[str, Any]:  # noqa: C
             instance.save(update_fields=["municipality", "province"])
 
         data: dict[str, Any] = super().to_representation(instance)
+        data.pop("wn_admin_notes", None) 
         datetime_fields = [
             "created_datetime",
             "modified_datetime",
@@ -328,13 +329,13 @@ def update(self, instance: Observation, validated_data: dict[Any, Any]) -> Obser
 
         # Automatically set eradication_date to today if eradication_result is present but eradication_date is not
         if eradication_result is not None and validated_data.get("eradication_date") is None:
-            validated_data["eradication_date"] = timezone.now().date()
+            validated_data["eradication_date"] = datetime.now().date()
 
         # Further eradication result logic
         if eradication_result == EradicationResultEnum.SUCCESSFUL:
             validated_data["reserved_datetime"] = None
             validated_data["reserved_by"] = None
-            validated_data["eradication_date"] = timezone.now().date()
+            validated_data["eradication_date"] = datetime.now().date()
 
         if not user.is_superuser:
             # Non-admins cannot update admin-specific fields, so remove them
@@ -359,7 +360,7 @@ def update(self, instance: Observation, validated_data: dict[Any, Any]) -> Obser
 
         # Conditionally set `reserved_by` and `reserved_datetime` for all users
         if "reserved_by" in validated_data and instance.reserved_by is None:
-            validated_data["reserved_datetime"] = timezone.now() if validated_data["reserved_by"] else None
+            validated_data["reserved_datetime"] = datetime.now() if validated_data["reserved_by"] else None
             instance.reserved_by = user
 
         # Prevent non-admin users from updating observations reserved by others
@@ -434,6 +435,7 @@ def to_internal_value(self, data: dict[str, Any]) -> dict[str, Any]:
         # Handle location validation separately (if provided)
         if "location" in data:
             data["location"] = self.validate_location(data["location"])
+        data.pop("wn_admin_notes", None)
         internal_data = super().to_internal_value(data)
         return dict(internal_data)
 
diff --git a/vespadb/observations/views.py b/vespadb/observations/views.py
index 175cfd9..0ab45f9 100644
--- a/vespadb/observations/views.py
+++ b/vespadb/observations/views.py
@@ -283,7 +283,7 @@ def get_paginated_response(self, data: list[dict[str, Any]]) -> Response:
             "results": data,
         })
 
-    @method_decorator(ratelimit(key="ip", rate="15/m", method="GET", block=True))
+    @method_decorator(ratelimit(key="ip", rate="60/m", method="GET", block=True))
     @swagger_auto_schema(
         operation_description="Retrieve a list of observations. Supports filtering and ordering.",
         responses={200: ObservationSerializer(many=True)},
@@ -339,7 +339,7 @@ def retrieve_list(self, request: Request, *args: Any, **kwargs: Any) -> Response
             )
         },
     )
-    @method_decorator(ratelimit(key="ip", rate="15/m", method="GET", block=True))
+    @method_decorator(ratelimit(key="ip", rate="60/m", method="GET", block=True))
     @action(detail=False, methods=["get"], url_path="dynamic-geojson")
     def geojson(self, request: Request) -> HttpResponse:
         """Generate GeoJSON data for the observations."""
@@ -420,7 +420,7 @@ def geojson(self, request: Request) -> HttpResponse:
         ),
         responses={200: "Success", 400: "Bad Request", 415: "Unsupported Media Type"},
     )
-    @method_decorator(ratelimit(key="ip", rate="15/m", method="GET", block=True))
+    @method_decorator(ratelimit(key="ip", rate="60/m", method="GET", block=True))
     @action(detail=False, methods=["post"], permission_classes=[IsAdminUser])
     @parser_classes([JSONParser, MultiPartParser, FormParser])
     def bulk_import(self, request: Request) -> Response:
@@ -630,7 +630,7 @@ def save_observations(self, valid_data: list[dict[str, Any]]) -> Response:
             ),
         ],
     )
-    @method_decorator(ratelimit(key="ip", rate="15/m", method="GET", block=True))
+    @method_decorator(ratelimit(key="ip", rate="60/m", method="GET", block=True))
     @action(detail=False, methods=["get"], permission_classes=[AllowAny])
     def export(self, request: Request) -> Response:
         """Export observations data in the specified format."""
@@ -746,7 +746,7 @@ def by_provinces(self, request: Request) -> Response:
         cache.set(cache_key, serializer.data, GET_REDIS_CACHE_EXPIRATION)
         return Response(serializer.data)
 
-    @method_decorator(ratelimit(key="ip", rate="15/m", method="GET", block=True))
+    @method_decorator(ratelimit(key="ip", rate="60/m", method="GET", block=True))
     def list(self, request: Request, *args: Any, **kwargs: Any) -> Response:
         """Override the list method to add caching."""
         cache_key = "vespadb::municipalities::list"
@@ -772,7 +772,7 @@ def get_permissions(self) -> list[BasePermission]:
             return [AllowAny()]
         return [IsAdminUser()]
 
-    @method_decorator(ratelimit(key="ip", rate="15/m", method="GET", block=True))
+    @method_decorator(ratelimit(key="ip", rate="60/m", method="GET", block=True))
     def list(self, request: Request, *args: Any, **kwargs: Any) -> Response:
         """Override the list method to add caching."""
         cache_key = "vespadb::provinces::list"