diff --git a/components/DataSheet.js b/components/DataSheet.js
index 80fd00779..a0af8ef57 100644
--- a/components/DataSheet.js
+++ b/components/DataSheet.js
@@ -72,13 +72,20 @@ function DataSheet() {
     );
   }, [GisStationsStaticDistrict, GisSystemStatic]);
 
-  const handleCheckboxChange = (name, event) => {
-    const { checked } = event.target;
-    setMapLayersVisibility((prev) => ({
+const handleCheckboxChange = (name, event) => {
+  const { checked } = event.target;
+  //console.log(`Checkbox ${name} checked state:`, checked);  // Log the checked state of the checkbox
+
+  setMapLayersVisibility((prev) => {
+    const newState = {
       ...prev,
       [name]: checked,
-    }));
-  };
+    };
+    //console.log(`New mapLayersVisibility state:`, newState);  // Log the new state after update
+    return newState;
+  });
+};
+
 
   return (
     <div
diff --git a/components/MapComponent.js b/components/MapComponent.js
index 5b75d792e..874e23064 100644
--- a/components/MapComponent.js
+++ b/components/MapComponent.js
@@ -335,6 +335,7 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
 
   const zoomIn = (e) => {
     initMap.flyTo(e.latlng, 12);
+    console.log("ZoomIn koordinaten in MapComponent", e.latlng);
   };
 
   const zoomOut = (e) => {
@@ -1458,22 +1459,45 @@ const MapComponent = ({ locations, onLocationUpdate }) => {
   //------------------------------------------ */
   const selectedArea = useRecoilValue(selectedAreaState);
 
-  useEffect(() => {
-    if (selectedArea && map) {
-      // Angenommen, jeder Marker hat eine option `areaName`, die beim Erstellen gesetzt wurde.
-      const marker = talasMarkers.find(
-        (marker) => marker.options.areaName === selectedArea
-      );
-      if (marker) {
-        map.flyTo(marker.getLatLng(), 14); // Zoomstufe anpassen nach Bedarf
-      }
-    }
-  }, [selectedArea, map]); // Abhängigkeiten beinhalten selectedArea und map
+// Combine all markers into a single array
+const allMarkers = [
+  ...talasMarkers,
+  ...eciMarkers,
+  ...gsmModemMarkers,
+  ...ciscoRouterMarkers,
+  ...wagoMarkers,
+  ...siemensMarkers,
+  ...otdrMarkers,
+  ...wdmMarkers,
+  ...gmaMarkers,
+  ...messstellenMarkers,
+  ...talasiclMarkers,
+  ...dauzMarkers,
+  ...smsfunkmodemMarkers,
+  ...sonstigeMarkers,
+  ...ulafMarkers,
+];
 
-  const findMyMarker = (areaName) => {
+// Function to find a marker by areaName across all groups
+const findMyMarker = (areaName) => {
+  return allMarkers.find((marker) => marker.options.areaName === areaName);
+};
+
+// Effect to handle navigation to selected area
+useEffect(() => {
+  if (selectedArea && map) {
+    const marker = findMyMarker(selectedArea);
+    if (marker) {
+      map.flyTo(marker.getLatLng(), 14); // Adjust zoom level as needed
+    }
+  }
+}, [selectedArea, map, allMarkers]); // Include allMarkers in the dependencies
+
+
+/*   const findMyMarker = (areaName) => {
     // Angenommen, jeder Marker hat eine option `areaName`, die beim Erstellen gesetzt wurde.
     return talasMarkers.find((marker) => marker.options.areaName === areaName);
-  };
+  }; */
 
   //------------------------------------------
 
diff --git a/config/config.js b/config/config.js
index 147cefac6..ac25b497f 100644
--- a/config/config.js
+++ b/config/config.js
@@ -31,17 +31,17 @@ if (typeof window !== "undefined") {
   user = url.searchParams.get("u") || "484"; // Ein weiterer Parameter aus der URL, Standardwert ist '484 admin zu testen von Stationen ausblenden und einblenden in der Card'
 
   // Konstruktion von URLs, die auf spezifische Ressourcen auf dem Server zeigen
-  mapGisStationsStaticDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStaticDistrict?idMap=${c}&idUser=${user}`; //idMap: 10, idUser: 484
+/*   mapGisStationsStaticDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStaticDistrict?idMap=${c}&idUser=${user}`; //idMap: 10, idUser: 484
   mapGisStationsStatusDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStatusDistrict?idMap=${c}&idUser=${user}`;
   mapGisStationsMeasurementsUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsMeasurements?idMap=${c}`;
   mapGisSystemStaticUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic?idMap=${c}&idUser=${user}`;
-  mapDataIconUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GetIconsStatic`;
+  mapDataIconUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GetIconsStatic`; */
 
-  /*  mapGisStationsStaticDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStaticDistrict`;
+   mapGisStationsStaticDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStaticDistrict`;
   mapGisStationsStatusDistrictUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsStatusDistrict`;
   mapGisStationsMeasurementsUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisStationsMeasurements`;
   mapGisSystemStaticUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic`;
-  mapDataIconUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GetIconsStatic`; */
+  mapDataIconUrl = `${serverURL}/talas5/ClientData/WebserviceMap.asmx/GetIconsStatic`;
 
   // URLs zu Offline-Daten, falls benötigt
 }
diff --git a/package-lock.json b/package-lock.json
index 2f954ceff..b462c6155 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "OpenStreetMapProject 19.04.2024",
+  "name": "OpenStreetMapProject-26.04.2024",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/pages/api/[...path].js b/pages/api/[...path].js
index 299b2253b..49efc5183 100644
--- a/pages/api/[...path].js
+++ b/pages/api/[...path].js
@@ -2,8 +2,8 @@
 import { createProxyMiddleware } from "http-proxy-middleware";
 
 export default createProxyMiddleware({
-  target: "http://10.10.0.13", // Ziel-URL des Proxys
-  //target: "http://192.168.10.187:3000", // Ziel-URL des Proxys
+  //target: "http://10.10.0.13", // Ziel-URL des Proxys
+  target: "http://192.168.10.187:3000", // Ziel-URL des Proxys
   changeOrigin: true,
   pathRewrite: {
     "^/api": "/", // Optional: Entfernt /api aus dem Pfad, wenn das Backend dies nicht erfordert