diff --git a/data/json/access/gates/gates_dispo_srz.geojson b/data/json/access/gates/gates_dispo_srz.geojson
index 3f1f5d91..3504e1d9 100644
--- a/data/json/access/gates/gates_dispo_srz.geojson
+++ b/data/json/access/gates/gates_dispo_srz.geojson
@@ -13180,7 +13180,9 @@
   "type": "Feature",
   "id": "node/919868782",
   "properties": {
+    "access": "no",
     "barrier": "gate",
+    "emergency": "yes",
     "id": "node/919868782"
   },
   "geometry": {
@@ -65305,6 +65307,21 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "node/8231001441",
+  "properties": {
+    "barrier": "lift_gate",
+    "id": "node/8231001441"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5527846,
+      47.4151586
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "node/8233931930",
diff --git a/data/json/access/gates/gates_kt_zh.geojson b/data/json/access/gates/gates_kt_zh.geojson
index e7dd0536..8b590dbf 100644
--- a/data/json/access/gates/gates_kt_zh.geojson
+++ b/data/json/access/gates/gates_kt_zh.geojson
@@ -10175,7 +10175,9 @@
   "type": "Feature",
   "id": "node/919868782",
   "properties": {
+    "access": "no",
     "barrier": "gate",
+    "emergency": "yes",
     "id": "node/919868782"
   },
   "geometry": {
@@ -56806,6 +56808,21 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "node/8231001441",
+  "properties": {
+    "barrier": "lift_gate",
+    "id": "node/8231001441"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5527846,
+      47.4151586
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "node/8233931930",
diff --git a/data/json/ambulance_station/ambulancestation_dispo_srz.geojson b/data/json/ambulance_station/ambulancestation_dispo_srz.geojson
index 29890b04..ab39f2bc 100644
--- a/data/json/ambulance_station/ambulancestation_dispo_srz.geojson
+++ b/data/json/ambulance_station/ambulancestation_dispo_srz.geojson
@@ -376,6 +376,69 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "way/368291218",
+  "properties": {
+    "addr:city": "Regensdorf",
+    "addr:housenumber": "183",
+    "addr:postcode": "8105",
+    "addr:street": "Riedthofstrasse",
+    "alt_name": "Wache Regensdorf",
+    "building": "service",
+    "emergency": "ambulance_station",
+    "name": "Rettungsdienst Limmattal - Wache Regensdorf",
+    "operator": "Rettungsdienst Limmattal",
+    "id": "way/368291218"
+  },
+  "geometry": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [
+          8.4624265,
+          47.4391805
+        ],
+        [
+          8.4624904,
+          47.4392656
+        ],
+        [
+          8.4621014,
+          47.4393992
+        ],
+        [
+          8.462033,
+          47.4393081
+        ],
+        [
+          8.4619914,
+          47.4393224
+        ],
+        [
+          8.461913,
+          47.439218
+        ],
+        [
+          8.4620427,
+          47.4391735
+        ],
+        [
+          8.4622126,
+          47.4391857
+        ],
+        [
+          8.4622533,
+          47.43924
+        ],
+        [
+          8.4624265,
+          47.4391805
+        ]
+      ]
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "way/843565567",
@@ -686,28 +749,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "node/7465975605",
-  "properties": {
-    "addr:city": "Regensdorf",
-    "addr:housenumber": "183",
-    "addr:postcode": "8105",
-    "addr:street": "Riedthofstrasse",
-    "emergency": "ambulance_station",
-    "name": "Rettungsdienst Limmattal - Wache Regensdorf",
-    "operator": "Rettungsdienst Limmattal",
-    "source": "local knowledge",
-    "id": "node/7465975605"
-  },
-  "geometry": {
-    "type": "Point",
-    "coordinates": [
-      8.4621506,
-      47.4393164
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "node/7465975608",
@@ -942,6 +983,27 @@
       47.2596602
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/11843241786",
+  "properties": {
+    "alt_name": "Wache MoPi",
+    "email": "info@mopi.ch",
+    "emergency": "ambulance_station",
+    "name": "MoPi",
+    "operator": "MoPi.ch AG",
+    "phone": "+41 80 014 43 65",
+    "website": "https://www.mopi.ch/",
+    "id": "node/11843241786"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5160027,
+      47.3879322
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/childcare/childcare_dispo_srz.geojson b/data/json/childcare/childcare_dispo_srz.geojson
index 697e5760..e6843502 100644
--- a/data/json/childcare/childcare_dispo_srz.geojson
+++ b/data/json/childcare/childcare_dispo_srz.geojson
@@ -13316,6 +13316,22 @@
       47.3402372
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/11844907898",
+  "properties": {
+    "amenity": "childcare",
+    "name": "pop e poppa",
+    "id": "node/11844907898"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5486405,
+      47.403622
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/childcare/childcare_kt_zh.geojson b/data/json/childcare/childcare_kt_zh.geojson
index e367a25c..160af9e1 100644
--- a/data/json/childcare/childcare_kt_zh.geojson
+++ b/data/json/childcare/childcare_kt_zh.geojson
@@ -12587,6 +12587,22 @@
       47.3402372
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/11844907898",
+  "properties": {
+    "amenity": "childcare",
+    "name": "pop e poppa",
+    "id": "node/11844907898"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5486405,
+      47.403622
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/defis/defis_dispo_srz.geojson b/data/json/defis/defis_dispo_srz.geojson
index d972d001..86385178 100644
--- a/data/json/defis/defis_dispo_srz.geojson
+++ b/data/json/defis/defis_dispo_srz.geojson
@@ -23262,29 +23262,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "node/8568554317",
-  "properties": {
-    "access": "no",
-    "defibrillator:location": "Privat in Wohnung und Fahrzeug Tiefgarage",
-    "description": "zwei Defibrillatoren vergügbar ZOLL AED 3 und ZOLL AED Plus",
-    "emergency": "defibrillator",
-    "emergency:phone": "144",
-    "indoor": "yes",
-    "opening_hours": "Mo-Su 17:00-07:00",
-    "operator": "Privat und Mitarbeiter Procamed. First Responder mit FR Rucksack im Fahrzeug",
-    "phone": "0765856752",
-    "id": "node/8568554317"
-  },
-  "geometry": {
-    "type": "Point",
-    "coordinates": [
-      8.6951281,
-      47.5017435
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "node/8568821818",
@@ -55305,15 +55282,17 @@
   "properties": {
     "access": "no",
     "defibrillator:location": "4. OG, Grossraumbüro / Küche",
-    "description": "oranger Koffer",
+    "description": "oranger Koffer\n0955LTM",
     "emergency": "defibrillator",
     "emergency:phone": "144",
     "indoor": "yes",
     "latitude": "47.38884",
+    "level": "4.OG",
     "longitude": "8.51982",
     "name": "MLL Meyerlustenberger Lachenal Froriep AG",
     "operator": "Lifetec AG Schweiz",
     "phone": "+41 800 122 144",
+    "ref": "0955LTM",
     "id": "node/10763309918"
   },
   "geometry": {
@@ -77060,6 +77039,236 @@
       47.0440706
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/11843182769",
+  "properties": {
+    "access": "permissive",
+    "defibrillator:location": "Sozialzentrum Helvetiaplatz, im Eingangsbereich",
+    "description": "während den Öffnungszeiten verfügbar",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "opening_hours": "Mo - Fr 09:00-16:30",
+    "operator": "Sozialdepartement, Soziale Dienste",
+    "phone": "+41 044 412 85 00",
+    "source": "local_knowledge, defikarte.ch",
+    "id": "node/11843182769"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5274023,
+      47.3762453
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843357169",
+  "properties": {
+    "access": "permissive",
+    "defibrillator:location": "Haupteingang Security Loge ",
+    "description": "An Tor Eingang via Tor Gegensprechanlage AED bei Security verlangen. Security wird AED am Eingangstor aushändigen. ",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "no",
+    "level": "0",
+    "opening_hours": "24/7",
+    "operator": "Vantage DC",
+    "phone": "+41762811263",
+    "source": "local_knowledge, defikarte.ch",
+    "id": "node/11843357169"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.7612319,
+      47.5005904
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843399769",
+  "properties": {
+    "access": "yes",
+    "defibrillator:location": "vor Lift, im Gebäude",
+    "description": "nur während Museumsöffnungszeiten verfügbar",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "1.Stock",
+    "operator": "Landesmuseum",
+    "id": "node/11843399769"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5409847,
+      47.3792767
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843478600",
+  "properties": {
+    "access": "private",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "2.OG Von Lift Raus, Rechts im Büro Eingang Mitte\n1351LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "2.og",
+    "name": "BDO",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1351LTM",
+    "id": "node/11843478600"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5198101,
+      47.3891074
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843521949",
+  "properties": {
+    "access": "private",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "1. OG von Lift Raus, Rechts im Büro Eingang Mitte\n1350 LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "1.OG",
+    "name": "BDO",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1350LTM",
+    "id": "node/11843521949"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5197836,
+      47.3891158
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843530414",
+  "properties": {
+    "access": "private",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "3. OG Von Lift raus, Rechts im Büro Eingang Mitte\n1352LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "3.og",
+    "name": "BDO",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1352LTM",
+    "id": "node/11843530414"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5198844,
+      47.3890846
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843545120",
+  "properties": {
+    "access": "permit",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "5. OG Von Lift raus, Links Eingang im Schrank bei Empfang\n1353 LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "5",
+    "name": "BDO",
+    "opening_hours": "MO-FR 08:00–12:00, 13:30–17:00",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1353LTM",
+    "id": "node/11843545120"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5199092,
+      47.3890738
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11844338318",
+  "properties": {
+    "access": "yes",
+    "addr:housenumber": "11a",
+    "addr:street": "Industriestrasse",
+    "defibrillator:location": "Werkstatt bei Feuerwehrschlauch/Durchgang zu Treppenhaus\n1362LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "name": "WB Bürgin AG",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1362LTM",
+    "id": "node/11844338318"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.7595053,
+      47.2816609
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11846336170",
+  "properties": {
+    "access": "yes",
+    "defibrillator:location": "Aussenbereich an der Wand Carport neben Auto, gelber Aussenkasten",
+    "description": "ZOLL AED 3 BLS mit Notfallset.",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "no",
+    "level": "0",
+    "opening_hours": "24/7",
+    "operator": "Marco Jenni",
+    "phone": "0765856752",
+    "id": "node/11846336170"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.6711328,
+      47.4333605
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/defis/defis_kt_zh.geojson b/data/json/defis/defis_kt_zh.geojson
index f14e24d6..98f12116 100644
--- a/data/json/defis/defis_kt_zh.geojson
+++ b/data/json/defis/defis_kt_zh.geojson
@@ -14736,29 +14736,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "node/8568554317",
-  "properties": {
-    "access": "no",
-    "defibrillator:location": "Privat in Wohnung und Fahrzeug Tiefgarage",
-    "description": "zwei Defibrillatoren vergügbar ZOLL AED 3 und ZOLL AED Plus",
-    "emergency": "defibrillator",
-    "emergency:phone": "144",
-    "indoor": "yes",
-    "opening_hours": "Mo-Su 17:00-07:00",
-    "operator": "Privat und Mitarbeiter Procamed. First Responder mit FR Rucksack im Fahrzeug",
-    "phone": "0765856752",
-    "id": "node/8568554317"
-  },
-  "geometry": {
-    "type": "Point",
-    "coordinates": [
-      8.6951281,
-      47.5017435
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "node/8568821818",
@@ -41240,15 +41217,17 @@
   "properties": {
     "access": "no",
     "defibrillator:location": "4. OG, Grossraumbüro / Küche",
-    "description": "oranger Koffer",
+    "description": "oranger Koffer\n0955LTM",
     "emergency": "defibrillator",
     "emergency:phone": "144",
     "indoor": "yes",
     "latitude": "47.38884",
+    "level": "4.OG",
     "longitude": "8.51982",
     "name": "MLL Meyerlustenberger Lachenal Froriep AG",
     "operator": "Lifetec AG Schweiz",
     "phone": "+41 800 122 144",
+    "ref": "0955LTM",
     "id": "node/10763309918"
   },
   "geometry": {
@@ -59141,6 +59120,236 @@
       47.4700158
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/11843182769",
+  "properties": {
+    "access": "permissive",
+    "defibrillator:location": "Sozialzentrum Helvetiaplatz, im Eingangsbereich",
+    "description": "während den Öffnungszeiten verfügbar",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "opening_hours": "Mo - Fr 09:00-16:30",
+    "operator": "Sozialdepartement, Soziale Dienste",
+    "phone": "+41 044 412 85 00",
+    "source": "local_knowledge, defikarte.ch",
+    "id": "node/11843182769"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5274023,
+      47.3762453
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843357169",
+  "properties": {
+    "access": "permissive",
+    "defibrillator:location": "Haupteingang Security Loge ",
+    "description": "An Tor Eingang via Tor Gegensprechanlage AED bei Security verlangen. Security wird AED am Eingangstor aushändigen. ",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "no",
+    "level": "0",
+    "opening_hours": "24/7",
+    "operator": "Vantage DC",
+    "phone": "+41762811263",
+    "source": "local_knowledge, defikarte.ch",
+    "id": "node/11843357169"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.7612319,
+      47.5005904
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843399769",
+  "properties": {
+    "access": "yes",
+    "defibrillator:location": "vor Lift, im Gebäude",
+    "description": "nur während Museumsöffnungszeiten verfügbar",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "1.Stock",
+    "operator": "Landesmuseum",
+    "id": "node/11843399769"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5409847,
+      47.3792767
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843478600",
+  "properties": {
+    "access": "private",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "2.OG Von Lift Raus, Rechts im Büro Eingang Mitte\n1351LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "2.og",
+    "name": "BDO",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1351LTM",
+    "id": "node/11843478600"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5198101,
+      47.3891074
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843521949",
+  "properties": {
+    "access": "private",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "1. OG von Lift Raus, Rechts im Büro Eingang Mitte\n1350 LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "1.OG",
+    "name": "BDO",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1350LTM",
+    "id": "node/11843521949"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5197836,
+      47.3891158
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843530414",
+  "properties": {
+    "access": "private",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "3. OG Von Lift raus, Rechts im Büro Eingang Mitte\n1352LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "3.og",
+    "name": "BDO",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1352LTM",
+    "id": "node/11843530414"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5198844,
+      47.3890846
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843545120",
+  "properties": {
+    "access": "permit",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "5. OG Von Lift raus, Links Eingang im Schrank bei Empfang\n1353 LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "5",
+    "name": "BDO",
+    "opening_hours": "MO-FR 08:00–12:00, 13:30–17:00",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1353LTM",
+    "id": "node/11843545120"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5199092,
+      47.3890738
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11844338318",
+  "properties": {
+    "access": "yes",
+    "addr:housenumber": "11a",
+    "addr:street": "Industriestrasse",
+    "defibrillator:location": "Werkstatt bei Feuerwehrschlauch/Durchgang zu Treppenhaus\n1362LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "name": "WB Bürgin AG",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1362LTM",
+    "id": "node/11844338318"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.7595053,
+      47.2816609
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11846336170",
+  "properties": {
+    "access": "yes",
+    "defibrillator:location": "Aussenbereich an der Wand Carport neben Auto, gelber Aussenkasten",
+    "description": "ZOLL AED 3 BLS mit Notfallset.",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "no",
+    "level": "0",
+    "opening_hours": "24/7",
+    "operator": "Marco Jenni",
+    "phone": "0765856752",
+    "id": "node/11846336170"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.6711328,
+      47.4333605
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/defis/defis_stadt_zh.geojson b/data/json/defis/defis_stadt_zh.geojson
index 7f0e7ae3..14b50ba5 100644
--- a/data/json/defis/defis_stadt_zh.geojson
+++ b/data/json/defis/defis_stadt_zh.geojson
@@ -8645,15 +8645,17 @@
   "properties": {
     "access": "no",
     "defibrillator:location": "4. OG, Grossraumbüro / Küche",
-    "description": "oranger Koffer",
+    "description": "oranger Koffer\n0955LTM",
     "emergency": "defibrillator",
     "emergency:phone": "144",
     "indoor": "yes",
     "latitude": "47.38884",
+    "level": "4.OG",
     "longitude": "8.51982",
     "name": "MLL Meyerlustenberger Lachenal Froriep AG",
     "operator": "Lifetec AG Schweiz",
     "phone": "+41 800 122 144",
+    "ref": "0955LTM",
     "id": "node/10763309918"
   },
   "geometry": {
@@ -13897,6 +13899,161 @@
       47.3480518
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/11843182769",
+  "properties": {
+    "access": "permissive",
+    "defibrillator:location": "Sozialzentrum Helvetiaplatz, im Eingangsbereich",
+    "description": "während den Öffnungszeiten verfügbar",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "opening_hours": "Mo - Fr 09:00-16:30",
+    "operator": "Sozialdepartement, Soziale Dienste",
+    "phone": "+41 044 412 85 00",
+    "source": "local_knowledge, defikarte.ch",
+    "id": "node/11843182769"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5274023,
+      47.3762453
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843399769",
+  "properties": {
+    "access": "yes",
+    "defibrillator:location": "vor Lift, im Gebäude",
+    "description": "nur während Museumsöffnungszeiten verfügbar",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "1.Stock",
+    "operator": "Landesmuseum",
+    "id": "node/11843399769"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5409847,
+      47.3792767
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843478600",
+  "properties": {
+    "access": "private",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "2.OG Von Lift Raus, Rechts im Büro Eingang Mitte\n1351LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "2.og",
+    "name": "BDO",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1351LTM",
+    "id": "node/11843478600"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5198101,
+      47.3891074
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843521949",
+  "properties": {
+    "access": "private",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "1. OG von Lift Raus, Rechts im Büro Eingang Mitte\n1350 LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "1.OG",
+    "name": "BDO",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1350LTM",
+    "id": "node/11843521949"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5197836,
+      47.3891158
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843530414",
+  "properties": {
+    "access": "private",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "3. OG Von Lift raus, Rechts im Büro Eingang Mitte\n1352LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "3.og",
+    "name": "BDO",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1352LTM",
+    "id": "node/11843530414"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5198844,
+      47.3890846
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11843545120",
+  "properties": {
+    "access": "permit",
+    "addr:housenumber": "2",
+    "addr:street": "Schiffbaustrasse",
+    "defibrillator:location": "5. OG Von Lift raus, Links Eingang im Schrank bei Empfang\n1353 LTM",
+    "description": "Oranger Koffer",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "5",
+    "name": "BDO",
+    "opening_hours": "MO-FR 08:00–12:00, 13:30–17:00",
+    "operator": "Lifetec AG Schweiz",
+    "phone": "+41 800 122 144",
+    "ref": "1353LTM",
+    "id": "node/11843545120"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5199092,
+      47.3890738
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/facilities/hospital/hospital_dispo_srz.geojson b/data/json/facilities/hospital/hospital_dispo_srz.geojson
index dbecbdde..b053db26 100644
--- a/data/json/facilities/hospital/hospital_dispo_srz.geojson
+++ b/data/json/facilities/hospital/hospital_dispo_srz.geojson
@@ -13006,27 +13006,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "node/9562163314",
-  "properties": {
-    "amenity": "clinic",
-    "email": "hello@viselio.com",
-    "level": "9",
-    "name": "Testcenter beim Radisson Blu",
-    "operator": "Viselio",
-    "phone": "+41 44 505 12 92",
-    "website": "https://www.viselio.com/zrh/",
-    "id": "node/9562163314"
-  },
-  "geometry": {
-    "type": "Point",
-    "coordinates": [
-      8.5640781,
-      47.4526417
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "node/9611423948",
diff --git a/data/json/facilities/hospital/hospital_kt_zh.geojson b/data/json/facilities/hospital/hospital_kt_zh.geojson
index 23904b49..c85a167a 100644
--- a/data/json/facilities/hospital/hospital_kt_zh.geojson
+++ b/data/json/facilities/hospital/hospital_kt_zh.geojson
@@ -10182,27 +10182,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "node/9562163314",
-  "properties": {
-    "amenity": "clinic",
-    "email": "hello@viselio.com",
-    "level": "9",
-    "name": "Testcenter beim Radisson Blu",
-    "operator": "Viselio",
-    "phone": "+41 44 505 12 92",
-    "website": "https://www.viselio.com/zrh/",
-    "id": "node/9562163314"
-  },
-  "geometry": {
-    "type": "Point",
-    "coordinates": [
-      8.5640781,
-      47.4526417
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "node/9658529728",
diff --git a/data/json/facilities/hospital/hospital_switzerland.geojson b/data/json/facilities/hospital/hospital_switzerland.geojson
index b6313f5a..3ed3e1c4 100644
--- a/data/json/facilities/hospital/hospital_switzerland.geojson
+++ b/data/json/facilities/hospital/hospital_switzerland.geojson
@@ -1035,247 +1035,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "relation/9056474",
-  "properties": {
-    "amenity": "hospital",
-    "contact:phone": "+41 316322111",
-    "contact:website": "http://www.kinderkliniken.insel.ch/",
-    "emergency": "yes",
-    "healthcare": "hospital",
-    "healthcare:speciality": "paediatrics",
-    "name": "Julie-von-Jenner-Haus",
-    "old_name": "Kinderkliniken Inselspital",
-    "operator": "Insel Gruppe AG",
-    "type": "multipolygon",
-    "wikidata": "Q30254034",
-    "id": "relation/9056474"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          7.4255516,
-          46.946734
-        ],
-        [
-          7.4257911,
-          46.9465526
-        ],
-        [
-          7.4258703,
-          46.9466017
-        ],
-        [
-          7.4259303,
-          46.9465564
-        ],
-        [
-          7.4259737,
-          46.9465834
-        ],
-        [
-          7.4260099,
-          46.9466058
-        ],
-        [
-          7.4260689,
-          46.9465613
-        ],
-        [
-          7.4261552,
-          46.9466148
-        ],
-        [
-          7.4260961,
-          46.9466594
-        ],
-        [
-          7.4261687,
-          46.9467047
-        ],
-        [
-          7.4262891,
-          46.946614
-        ],
-        [
-          7.4263682,
-          46.9466636
-        ],
-        [
-          7.4264284,
-          46.9466182
-        ],
-        [
-          7.426594,
-          46.9467205
-        ],
-        [
-          7.4264742,
-          46.9468107
-        ],
-        [
-          7.4265535,
-          46.94686
-        ],
-        [
-          7.4264182,
-          46.9469624
-        ],
-        [
-          7.4263731,
-          46.9469965
-        ],
-        [
-          7.4264524,
-          46.9470457
-        ],
-        [
-          7.4264403,
-          46.947055
-        ],
-        [
-          7.4264935,
-          46.9470878
-        ],
-        [
-          7.4264673,
-          46.9471376
-        ],
-        [
-          7.4263922,
-          46.9470913
-        ],
-        [
-          7.4263347,
-          46.9471348
-        ],
-        [
-          7.4262945,
-          46.9471652
-        ],
-        [
-          7.4263619,
-          46.9472071
-        ],
-        [
-          7.426318,
-          46.9472469
-        ],
-        [
-          7.4262457,
-          46.947202
-        ],
-        [
-          7.4262219,
-          46.94722
-        ],
-        [
-          7.426147,
-          46.9472767
-        ],
-        [
-          7.4261032,
-          46.9472496
-        ],
-        [
-          7.4258939,
-          46.94712
-        ],
-        [
-          7.4257886,
-          46.9470543
-        ],
-        [
-          7.4257412,
-          46.9470246
-        ],
-        [
-          7.4258035,
-          46.9469805
-        ],
-        [
-          7.4257302,
-          46.9469357
-        ],
-        [
-          7.4255502,
-          46.9470714
-        ],
-        [
-          7.4254642,
-          46.947018
-        ],
-        [
-          7.4255239,
-          46.9469727
-        ],
-        [
-          7.4254512,
-          46.9469276
-        ],
-        [
-          7.4253914,
-          46.9469728
-        ],
-        [
-          7.4251964,
-          46.9468519
-        ],
-        [
-          7.4251533,
-          46.9468252
-        ],
-        [
-          7.4250931,
-          46.9468703
-        ],
-        [
-          7.4249025,
-          46.9467517
-        ],
-        [
-          7.4248866,
-          46.9467637
-        ],
-        [
-          7.4248326,
-          46.9467305
-        ],
-        [
-          7.4251544,
-          46.9464872
-        ],
-        [
-          7.4253249,
-          46.9465941
-        ],
-        [
-          7.4253995,
-          46.9466395
-        ],
-        [
-          7.4253394,
-          46.9466849
-        ],
-        [
-          7.4254118,
-          46.9467298
-        ],
-        [
-          7.4254718,
-          46.9466845
-        ],
-        [
-          7.4255516,
-          46.946734
-        ]
-      ]
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "relation/9065183",
@@ -44211,7 +43970,7 @@
     "addr:postcode": "4500",
     "addr:street": "Schöngrünstrasse",
     "amenity": "hospital",
-    "email": "info.bss@spital.so.ch",
+    "email": "nicola.jedvaj@helion.ch",
     "emergency": "yes",
     "fax": "+41 32 627 30 79",
     "healthcare": "hospital",
@@ -54005,27 +53764,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "node/9562163314",
-  "properties": {
-    "amenity": "clinic",
-    "email": "hello@viselio.com",
-    "level": "9",
-    "name": "Testcenter beim Radisson Blu",
-    "operator": "Viselio",
-    "phone": "+41 44 505 12 92",
-    "website": "https://www.viselio.com/zrh/",
-    "id": "node/9562163314"
-  },
-  "geometry": {
-    "type": "Point",
-    "coordinates": [
-      8.5640781,
-      47.4526417
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "node/9566025272",
@@ -55825,6 +55563,49 @@
       46.8020019
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/11845447220",
+  "properties": {
+    "amenity": "hospital",
+    "contact:phone": "+41 31 632 21 11",
+    "contact:website": "http://www.kinderkliniken.insel.ch/",
+    "emergency": "yes",
+    "healthcare": "hospital",
+    "healthcare:speciality": "paediatrics",
+    "name": "Kinderkliniken Inselspital",
+    "operator": "Insel Gruppe AG",
+    "wikidata": "Q30254034",
+    "id": "node/11845447220"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      7.4259426,
+      46.9469004
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/11846334610",
+  "properties": {
+    "amenity": "hospital",
+    "healthcare": "hospital",
+    "healthcare:speciality": "dental_oral_maxillo_facial_surgery",
+    "name": "Klinik für Mund-, Kiefer- und Gesichtschirurgie",
+    "phone": "+41 62 838 45 08",
+    "website": "https://www.ksa.ch/de/kantonsspital-aarau/aufenthalt-und-besuch/fachbereiche/mkg-mund-kiefer-gesichtschirurgie",
+    "id": "node/11846334610"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.0588524,
+      47.3891398
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/facilities/social_facilities/social_facilities_dispo_srz.geojson b/data/json/facilities/social_facilities/social_facilities_dispo_srz.geojson
index 807ff008..44e8e996 100644
--- a/data/json/facilities/social_facilities/social_facilities_dispo_srz.geojson
+++ b/data/json/facilities/social_facilities/social_facilities_dispo_srz.geojson
@@ -2181,10 +2181,12 @@
     "amenity": "social_facility",
     "building": "dormitory",
     "building:levels": "3",
+    "check_date": "2024-04-24",
     "name": "Wohnheim Heilsarmee",
     "operator": "Heilsarmee",
     "phone": "+41 52 208 90 50",
     "roof:levels": "2",
+    "roof:shape": "gabled",
     "social_facility": "assisted_living",
     "website": "https://www.heilsarmee.ch/standorte/wohnheim-winterthur",
     "id": "way/22814914"
@@ -23348,6 +23350,7 @@
   "id": "way/212711723",
   "properties": {
     "amenity": "social_facility",
+    "check_date": "2024-04-23",
     "name": "Alterssiedlung Winterberg",
     "social_facility": "assisted_living",
     "social_facility:for": "senior",
@@ -52263,6 +52266,7 @@
   "properties": {
     "access": "yes",
     "amenity": "social_facility",
+    "brand:wikipedia": "de:Foodsharing.de",
     "covered": "no",
     "fee": "no",
     "fridge": "yes",
@@ -52274,7 +52278,6 @@
     "operator": "gzoerlikon",
     "social_facility": "food_bank",
     "social_facility:for": "everyone",
-    "wikipedia": "de:Foodsharing.de",
     "id": "node/8152206418"
   },
   "geometry": {
diff --git a/data/json/facilities/social_facilities/social_facilities_kt_zh.geojson b/data/json/facilities/social_facilities/social_facilities_kt_zh.geojson
index 637e24f5..3b72418a 100644
--- a/data/json/facilities/social_facilities/social_facilities_kt_zh.geojson
+++ b/data/json/facilities/social_facilities/social_facilities_kt_zh.geojson
@@ -1961,10 +1961,12 @@
     "amenity": "social_facility",
     "building": "dormitory",
     "building:levels": "3",
+    "check_date": "2024-04-24",
     "name": "Wohnheim Heilsarmee",
     "operator": "Heilsarmee",
     "phone": "+41 52 208 90 50",
     "roof:levels": "2",
+    "roof:shape": "gabled",
     "social_facility": "assisted_living",
     "website": "https://www.heilsarmee.ch/standorte/wohnheim-winterthur",
     "id": "way/22814914"
@@ -21292,6 +21294,7 @@
   "id": "way/212711723",
   "properties": {
     "amenity": "social_facility",
+    "check_date": "2024-04-23",
     "name": "Alterssiedlung Winterberg",
     "social_facility": "assisted_living",
     "social_facility:for": "senior",
@@ -42935,6 +42938,7 @@
   "properties": {
     "access": "yes",
     "amenity": "social_facility",
+    "brand:wikipedia": "de:Foodsharing.de",
     "covered": "no",
     "fee": "no",
     "fridge": "yes",
@@ -42946,7 +42950,6 @@
     "operator": "gzoerlikon",
     "social_facility": "food_bank",
     "social_facility:for": "everyone",
-    "wikipedia": "de:Foodsharing.de",
     "id": "node/8152206418"
   },
   "geometry": {
diff --git a/data/json/fire_station/firestation_kt_zh.geojson b/data/json/fire_station/firestation_kt_zh.geojson
index 165d034c..5d2802c3 100644
--- a/data/json/fire_station/firestation_kt_zh.geojson
+++ b/data/json/fire_station/firestation_kt_zh.geojson
@@ -3226,7 +3226,7 @@
     "addr:housenumber": "125",
     "addr:postcode": "8105",
     "addr:street": "Riedthofstrasse",
-    "alt_name": "Wache Regensdorf",
+    "alt_name": "Depot Regensdorf",
     "amenity": "fire_station",
     "building": "apartments",
     "name": "Feuerwehr Regensdorf",
diff --git a/data/json/highway/trunk/trunk_dispo_srz.geojson b/data/json/highway/trunk/trunk_dispo_srz.geojson
index 4de25a06..8966ea44 100644
--- a/data/json/highway/trunk/trunk_dispo_srz.geojson
+++ b/data/json/highway/trunk/trunk_dispo_srz.geojson
@@ -2620,6 +2620,7 @@
     "maxspeed": "80",
     "oneway": "yes",
     "ref": "A1L",
+    "surface": "asphalt",
     "toll": "yes",
     "id": "way/10621367"
   },
@@ -14393,6 +14394,7 @@
     "maxspeed": "80",
     "oneway": "yes",
     "ref": "A1L",
+    "surface": "asphalt",
     "toll": "yes",
     "tunnel": "yes",
     "tunnel:name": "Milchbucktunnel",
diff --git a/data/json/kindergarten/kindergarten_dispo_srz.geojson b/data/json/kindergarten/kindergarten_dispo_srz.geojson
index e2e2bbb8..687e053d 100644
--- a/data/json/kindergarten/kindergarten_dispo_srz.geojson
+++ b/data/json/kindergarten/kindergarten_dispo_srz.geojson
@@ -36462,6 +36462,7 @@
     "building:levels": "2",
     "name": "Provisorium Kindergarten Schützenwiese",
     "operator": "Stadt Winterthur",
+    "roof:shape": "flat",
     "id": "way/1191768971"
   },
   "geometry": {
diff --git a/data/json/kindergarten/kindergarten_kt_zh.geojson b/data/json/kindergarten/kindergarten_kt_zh.geojson
index e0b6cb32..6252cf11 100644
--- a/data/json/kindergarten/kindergarten_kt_zh.geojson
+++ b/data/json/kindergarten/kindergarten_kt_zh.geojson
@@ -31767,6 +31767,7 @@
     "building:levels": "2",
     "name": "Provisorium Kindergarten Schützenwiese",
     "operator": "Stadt Winterthur",
+    "roof:shape": "flat",
     "id": "way/1191768971"
   },
   "geometry": {
diff --git a/data/json/schools/schools_dispo_srz.geojson b/data/json/schools/schools_dispo_srz.geojson
index cd1dfc93..aaab0d23 100644
--- a/data/json/schools/schools_dispo_srz.geojson
+++ b/data/json/schools/schools_dispo_srz.geojson
@@ -68263,6 +68263,7 @@
   "id": "way/223565665",
   "properties": {
     "amenity": "school",
+    "check_date": "2024-04-23",
     "name": "Schule Bachwis",
     "id": "way/223565665"
   },
diff --git a/data/json/schools/schools_kt_zh.geojson b/data/json/schools/schools_kt_zh.geojson
index 4cbcb45f..6fa6658b 100644
--- a/data/json/schools/schools_kt_zh.geojson
+++ b/data/json/schools/schools_kt_zh.geojson
@@ -55699,6 +55699,7 @@
   "id": "way/223565665",
   "properties": {
     "amenity": "school",
+    "check_date": "2024-04-23",
     "name": "Schule Bachwis",
     "id": "way/223565665"
   },