diff --git a/data/json/access/gates/gates_dispo_srz.geojson b/data/json/access/gates/gates_dispo_srz.geojson
index 3542b4ff..9a4627fc 100644
--- a/data/json/access/gates/gates_dispo_srz.geojson
+++ b/data/json/access/gates/gates_dispo_srz.geojson
@@ -43212,6 +43212,24 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "node/4362266550",
+  "properties": {
+    "access": "no",
+    "barrier": "gate",
+    "locked": "yes",
+    "name": "Tor 126",
+    "id": "node/4362266550"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5451257,
+      47.4527533
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "node/4367364667",
@@ -54434,24 +54452,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "node/6359065516",
-  "properties": {
-    "access": "no",
-    "barrier": "gate",
-    "locked": "yes",
-    "name": "Tor 126",
-    "id": "node/6359065516"
-  },
-  "geometry": {
-    "type": "Point",
-    "coordinates": [
-      8.5451474,
-      47.4527075
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "node/6367264877",
@@ -100153,6 +100153,51 @@
       47.4321318
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/12376092027",
+  "properties": {
+    "barrier": "lift_gate",
+    "id": "node/12376092027"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.4703618,
+      47.4395205
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/12376092031",
+  "properties": {
+    "barrier": "lift_gate",
+    "id": "node/12376092031"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.4706006,
+      47.4397049
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/12376092032",
+  "properties": {
+    "barrier": "lift_gate",
+    "id": "node/12376092032"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.470181,
+      47.4394288
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/access/gates/gates_kt_zh.geojson b/data/json/access/gates/gates_kt_zh.geojson
index 36372bca..172ff978 100644
--- a/data/json/access/gates/gates_kt_zh.geojson
+++ b/data/json/access/gates/gates_kt_zh.geojson
@@ -36644,6 +36644,24 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "node/4362266550",
+  "properties": {
+    "access": "no",
+    "barrier": "gate",
+    "locked": "yes",
+    "name": "Tor 126",
+    "id": "node/4362266550"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5451257,
+      47.4527533
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "node/4377827308",
@@ -47067,24 +47085,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "node/6359065516",
-  "properties": {
-    "access": "no",
-    "barrier": "gate",
-    "locked": "yes",
-    "name": "Tor 126",
-    "id": "node/6359065516"
-  },
-  "geometry": {
-    "type": "Point",
-    "coordinates": [
-      8.5451474,
-      47.4527075
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "node/6367264877",
@@ -86888,6 +86888,51 @@
       47.4321318
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/12376092027",
+  "properties": {
+    "barrier": "lift_gate",
+    "id": "node/12376092027"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.4703618,
+      47.4395205
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/12376092031",
+  "properties": {
+    "barrier": "lift_gate",
+    "id": "node/12376092031"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.4706006,
+      47.4397049
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/12376092032",
+  "properties": {
+    "barrier": "lift_gate",
+    "id": "node/12376092032"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.470181,
+      47.4394288
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/defis/defis_dispo_srz.geojson b/data/json/defis/defis_dispo_srz.geojson
index 009c4cd1..d301e845 100644
--- a/data/json/defis/defis_dispo_srz.geojson
+++ b/data/json/defis/defis_dispo_srz.geojson
@@ -12792,6 +12792,7 @@
     "description": "während Öffnungszeiten verfügbar",
     "emergency": "defibrillator",
     "emergency:phone": "144",
+    "indoor": "yes",
     "id": "node/7930278099"
   },
   "geometry": {
@@ -13402,7 +13403,8 @@
   "properties": {
     "access": "yes",
     "addr:city": "6300 Zug",
-    "addr:street": "General-Guisin-Strasse 2",
+    "addr:housenumber": "2",
+    "addr:street": "General-Guisan-Strasse",
     "defibrillator:location": "Sporthalle Zug, Seiteneingang links",
     "description": "während Öffnungszeiten verfügbar",
     "emergency": "defibrillator",
@@ -83838,6 +83840,49 @@
       47.4562865
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/12375892801",
+  "properties": {
+    "access": "permissive",
+    "defibrillator:location": "Schulhaus Bürgli, Turnhalle",
+    "description": "Während Schulzeit (Während Schulferien geschlossen)",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "0",
+    "opening_hours": "07:30 - 22:00 ",
+    "operator": "Schulhaus Bürgli, Stadt Wallisellen ",
+    "phone": "+4179 877 64 46 ",
+    "source": "local_knowledge, defikarte.ch",
+    "id": "node/12375892801"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.6005783,
+      47.4150644
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/12376713931",
+  "properties": {
+    "access": "permit",
+    "defibrillator:location": "Im Foyer der Firma",
+    "emergency": "defibrillator",
+    "indoor": "yes",
+    "id": "node/12376713931"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5976115,
+      47.4488605
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/defis/defis_kt_zh.geojson b/data/json/defis/defis_kt_zh.geojson
index 0f48b99a..e152691b 100644
--- a/data/json/defis/defis_kt_zh.geojson
+++ b/data/json/defis/defis_kt_zh.geojson
@@ -64829,6 +64829,49 @@
       47.4562865
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/12375892801",
+  "properties": {
+    "access": "permissive",
+    "defibrillator:location": "Schulhaus Bürgli, Turnhalle",
+    "description": "Während Schulzeit (Während Schulferien geschlossen)",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "yes",
+    "level": "0",
+    "opening_hours": "07:30 - 22:00 ",
+    "operator": "Schulhaus Bürgli, Stadt Wallisellen ",
+    "phone": "+4179 877 64 46 ",
+    "source": "local_knowledge, defikarte.ch",
+    "id": "node/12375892801"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.6005783,
+      47.4150644
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "node/12376713931",
+  "properties": {
+    "access": "permit",
+    "defibrillator:location": "Im Foyer der Firma",
+    "emergency": "defibrillator",
+    "indoor": "yes",
+    "id": "node/12376713931"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.5976115,
+      47.4488605
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/facilities/hospital/hospital_switzerland.geojson b/data/json/facilities/hospital/hospital_switzerland.geojson
index c11373d6..7575911d 100644
--- a/data/json/facilities/hospital/hospital_switzerland.geojson
+++ b/data/json/facilities/hospital/hospital_switzerland.geojson
@@ -7043,8 +7043,8 @@
           47.3862838
         ],
         [
-          8.0593912,
-          47.3861936
+          8.0594048,
+          47.3861958
         ],
         [
           8.0601248,
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 45adcf29..f8b95f02 100644
--- a/data/json/facilities/social_facilities/social_facilities_dispo_srz.geojson
+++ b/data/json/facilities/social_facilities/social_facilities_dispo_srz.geojson
@@ -57576,6 +57576,7 @@
     "amenity": "social_facility",
     "appliance:repair": "yes",
     "clothes:repair": "yes",
+    "clothes:upcycling": "yes",
     "description": "Arbeitsintegration für Jugendliche und junge Erwachsene. In unserer kleinen Werkstatt freut sich unser Team, kreative Projekte mit den unterschiedlichsten Materialien umzusetzen.",
     "description:2": "Aktion am Repair Thursday: Flicken Textil, Holz, Metall, Haushaltsgeräte, Textilien, Elektronik...Teilnahme mit Voranmeldung",
     "electronics:repair": "yes",
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 6b8d5d54..359af1df 100644
--- a/data/json/facilities/social_facilities/social_facilities_kt_zh.geojson
+++ b/data/json/facilities/social_facilities/social_facilities_kt_zh.geojson
@@ -47767,6 +47767,7 @@
     "amenity": "social_facility",
     "appliance:repair": "yes",
     "clothes:repair": "yes",
+    "clothes:upcycling": "yes",
     "description": "Arbeitsintegration für Jugendliche und junge Erwachsene. In unserer kleinen Werkstatt freut sich unser Team, kreative Projekte mit den unterschiedlichsten Materialien umzusetzen.",
     "description:2": "Aktion am Repair Thursday: Flicken Textil, Holz, Metall, Haushaltsgeräte, Textilien, Elektronik...Teilnahme mit Voranmeldung",
     "electronics:repair": "yes",
diff --git a/data/json/kindergarten/kindergarten_dispo_srz.geojson b/data/json/kindergarten/kindergarten_dispo_srz.geojson
index f3c09d33..67a900f9 100644
--- a/data/json/kindergarten/kindergarten_dispo_srz.geojson
+++ b/data/json/kindergarten/kindergarten_dispo_srz.geojson
@@ -1791,83 +1791,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "way/33140491",
-  "properties": {
-    "addr:city": "Niederglatt",
-    "addr:housenumber": "2",
-    "addr:postcode": "8172",
-    "addr:street": "Im Guet",
-    "amenity": "kindergarten",
-    "building": "kindergarten",
-    "building:levels": "1",
-    "name": "Kindergarten Im Guet",
-    "operator": "Kanton Zürich",
-    "operator:type": "public",
-    "source": "yahoo aerial images",
-    "id": "way/33140491"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.5035012,
-          47.4924487
-        ],
-        [
-          8.5036043,
-          47.4924426
-        ],
-        [
-          8.5036034,
-          47.4924329
-        ],
-        [
-          8.5037135,
-          47.4924269
-        ],
-        [
-          8.5037145,
-          47.4924353
-        ],
-        [
-          8.5038184,
-          47.4924294
-        ],
-        [
-          8.5038299,
-          47.4925203
-        ],
-        [
-          8.5037688,
-          47.4925245
-        ],
-        [
-          8.5037702,
-          47.4925421
-        ],
-        [
-          8.5035784,
-          47.4925534
-        ],
-        [
-          8.5035767,
-          47.4925366
-        ],
-        [
-          8.5035144,
-          47.4925397
-        ],
-        [
-          8.5035012,
-          47.4924487
-        ]
-      ]
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "way/34213637",
@@ -37089,6 +37012,72 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "way/1338168875",
+  "properties": {
+    "amenity": "kindergarten",
+    "name": "Kindergarten Guet",
+    "operator": "Schule Niederglatt",
+    "operator:type": "public",
+    "id": "way/1338168875"
+  },
+  "geometry": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [
+          8.504288,
+          47.4923368
+        ],
+        [
+          8.5039573,
+          47.4924151
+        ],
+        [
+          8.5039802,
+          47.4925594
+        ],
+        [
+          8.5033888,
+          47.4925953
+        ],
+        [
+          8.503367,
+          47.4923743
+        ],
+        [
+          8.5039512,
+          47.4922071
+        ],
+        [
+          8.5040068,
+          47.4921965
+        ],
+        [
+          8.5040695,
+          47.4921981
+        ],
+        [
+          8.5041262,
+          47.4922104
+        ],
+        [
+          8.5041794,
+          47.4922348
+        ],
+        [
+          8.5042276,
+          47.4922699
+        ],
+        [
+          8.504288,
+          47.4923368
+        ]
+      ]
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "node/30985827",
diff --git a/data/json/kindergarten/kindergarten_kt_zh.geojson b/data/json/kindergarten/kindergarten_kt_zh.geojson
index a6e38904..70113d70 100644
--- a/data/json/kindergarten/kindergarten_kt_zh.geojson
+++ b/data/json/kindergarten/kindergarten_kt_zh.geojson
@@ -1682,83 +1682,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "way/33140491",
-  "properties": {
-    "addr:city": "Niederglatt",
-    "addr:housenumber": "2",
-    "addr:postcode": "8172",
-    "addr:street": "Im Guet",
-    "amenity": "kindergarten",
-    "building": "kindergarten",
-    "building:levels": "1",
-    "name": "Kindergarten Im Guet",
-    "operator": "Kanton Zürich",
-    "operator:type": "public",
-    "source": "yahoo aerial images",
-    "id": "way/33140491"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.5035012,
-          47.4924487
-        ],
-        [
-          8.5036043,
-          47.4924426
-        ],
-        [
-          8.5036034,
-          47.4924329
-        ],
-        [
-          8.5037135,
-          47.4924269
-        ],
-        [
-          8.5037145,
-          47.4924353
-        ],
-        [
-          8.5038184,
-          47.4924294
-        ],
-        [
-          8.5038299,
-          47.4925203
-        ],
-        [
-          8.5037688,
-          47.4925245
-        ],
-        [
-          8.5037702,
-          47.4925421
-        ],
-        [
-          8.5035784,
-          47.4925534
-        ],
-        [
-          8.5035767,
-          47.4925366
-        ],
-        [
-          8.5035144,
-          47.4925397
-        ],
-        [
-          8.5035012,
-          47.4924487
-        ]
-      ]
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "way/34213637",
@@ -32464,6 +32387,72 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "way/1338168875",
+  "properties": {
+    "amenity": "kindergarten",
+    "name": "Kindergarten Guet",
+    "operator": "Schule Niederglatt",
+    "operator:type": "public",
+    "id": "way/1338168875"
+  },
+  "geometry": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [
+          8.504288,
+          47.4923368
+        ],
+        [
+          8.5039573,
+          47.4924151
+        ],
+        [
+          8.5039802,
+          47.4925594
+        ],
+        [
+          8.5033888,
+          47.4925953
+        ],
+        [
+          8.503367,
+          47.4923743
+        ],
+        [
+          8.5039512,
+          47.4922071
+        ],
+        [
+          8.5040068,
+          47.4921965
+        ],
+        [
+          8.5040695,
+          47.4921981
+        ],
+        [
+          8.5041262,
+          47.4922104
+        ],
+        [
+          8.5041794,
+          47.4922348
+        ],
+        [
+          8.5042276,
+          47.4922699
+        ],
+        [
+          8.504288,
+          47.4923368
+        ]
+      ]
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "node/104302787",
diff --git a/data/json/schools/schools_dispo_srz.geojson b/data/json/schools/schools_dispo_srz.geojson
index f18580f4..9428df85 100644
--- a/data/json/schools/schools_dispo_srz.geojson
+++ b/data/json/schools/schools_dispo_srz.geojson
@@ -3038,144 +3038,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "way/10743313",
-  "properties": {
-    "addr:city": "Niederglatt",
-    "addr:housenumber": "61",
-    "addr:postcode": "8172",
-    "addr:street": "Grafschaftstrasse",
-    "amenity": "school",
-    "building": "school",
-    "name": "Eichi",
-    "id": "way/10743313"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.5003197,
-          47.4945609
-        ],
-        [
-          8.5001886,
-          47.4943755
-        ],
-        [
-          8.5001062,
-          47.4943565
-        ],
-        [
-          8.5001533,
-          47.4942632
-        ],
-        [
-          8.5000966,
-          47.4941866
-        ],
-        [
-          8.5001515,
-          47.494088
-        ],
-        [
-          8.5002577,
-          47.4940537
-        ],
-        [
-          8.5005611,
-          47.494483
-        ],
-        [
-          8.5003197,
-          47.4945609
-        ]
-      ]
-    ]
-  }
-},
-{
-  "type": "Feature",
-  "id": "way/10743320",
-  "properties": {
-    "addr:city": "Niederglatt",
-    "addr:housenumber": "63",
-    "addr:postcode": "8172",
-    "addr:street": "Grafschaftstrasse",
-    "amenity": "school",
-    "building": "school",
-    "name": "Eichi",
-    "id": "way/10743320"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.4995603,
-          47.4946899
-        ],
-        [
-          8.4994167,
-          47.4944803
-        ],
-        [
-          8.4996539,
-          47.4944041
-        ],
-        [
-          8.4997334,
-          47.4945192
-        ],
-        [
-          8.4998462,
-          47.4944836
-        ],
-        [
-          8.499877,
-          47.4945281
-        ],
-        [
-          8.4998917,
-          47.4945234
-        ],
-        [
-          8.4998952,
-          47.4945285
-        ],
-        [
-          8.4998917,
-          47.4945296
-        ],
-        [
-          8.4999196,
-          47.4945699
-        ],
-        [
-          8.499923,
-          47.4945688
-        ],
-        [
-          8.4999263,
-          47.4945735
-        ],
-        [
-          8.4997929,
-          47.4946157
-        ],
-        [
-          8.4996981,
-          47.4946453
-        ],
-        [
-          8.4995603,
-          47.4946899
-        ]
-      ]
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "way/10861441",
@@ -8573,6 +8435,8 @@
   "properties": {
     "amenity": "school",
     "name": "Schule Rietlen",
+    "operator": "Schule Niederglatt",
+    "operator:type": "public",
     "id": "way/28717271"
   },
   "geometry": {
@@ -46945,112 +46809,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "way/149032652",
-  "properties": {
-    "amenity": "school",
-    "building": "yes",
-    "name": "Echi",
-    "id": "way/149032652"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.4998096,
-          47.4948769
-        ],
-        [
-          8.4996858,
-          47.4946989
-        ],
-        [
-          8.4997257,
-          47.4946857
-        ],
-        [
-          8.4996981,
-          47.4946453
-        ],
-        [
-          8.4997929,
-          47.4946157
-        ],
-        [
-          8.4998341,
-          47.4946729
-        ],
-        [
-          8.4998968,
-          47.494653
-        ],
-        [
-          8.5000086,
-          47.4948126
-        ],
-        [
-          8.4998096,
-          47.4948769
-        ]
-      ]
-    ]
-  }
-},
-{
-  "type": "Feature",
-  "id": "way/149032901",
-  "properties": {
-    "amenity": "school",
-    "building": "yes",
-    "name": "Singsaal Eichi",
-    "id": "way/149032901"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.4998792,
-          47.4944299
-        ],
-        [
-          8.4997198,
-          47.4944822
-        ],
-        [
-          8.4996101,
-          47.494335
-        ],
-        [
-          8.4996366,
-          47.4943265
-        ],
-        [
-          8.4996409,
-          47.4943326
-        ],
-        [
-          8.4999628,
-          47.4942292
-        ],
-        [
-          8.4999656,
-          47.4942331
-        ],
-        [
-          8.5000193,
-          47.4942158
-        ],
-        [
-          8.4998792,
-          47.4944299
-        ]
-      ]
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "way/149258974",
@@ -126042,6 +125800,118 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "way/1338168876",
+  "properties": {
+    "amenity": "school",
+    "grades": "7-9",
+    "name": "Schulhaus Eichi",
+    "operator": "Sekundarschulgemeinde Niederhasli Niederglatt",
+    "operator:type": "public",
+    "website": "https://www.eduzis.ch/schulhaus-eichi/",
+    "id": "way/1338168876"
+  },
+  "geometry": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [
+          8.4977852,
+          47.4956365
+        ],
+        [
+          8.4970421,
+          47.4951539
+        ],
+        [
+          8.4970773,
+          47.4950998
+        ],
+        [
+          8.4974809,
+          47.4947708
+        ],
+        [
+          8.4991491,
+          47.4938117
+        ],
+        [
+          8.4994001,
+          47.4936871
+        ],
+        [
+          8.499555,
+          47.4936228
+        ],
+        [
+          8.4997203,
+          47.493562
+        ],
+        [
+          8.4999055,
+          47.4938392
+        ],
+        [
+          8.5000228,
+          47.493798
+        ],
+        [
+          8.5001918,
+          47.4940495
+        ],
+        [
+          8.5003546,
+          47.4939992
+        ],
+        [
+          8.5007773,
+          47.494636
+        ],
+        [
+          8.5001918,
+          47.4948722
+        ],
+        [
+          8.5001098,
+          47.4949148
+        ],
+        [
+          8.5000013,
+          47.4950444
+        ],
+        [
+          8.4999571,
+          47.4950674
+        ],
+        [
+          8.4998903,
+          47.4950734
+        ],
+        [
+          8.4993982,
+          47.4948227
+        ],
+        [
+          8.49919,
+          47.4947852
+        ],
+        [
+          8.4990474,
+          47.494804
+        ],
+        [
+          8.4989187,
+          47.4948679
+        ],
+        [
+          8.4977852,
+          47.4956365
+        ]
+      ]
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "node/256335788",
diff --git a/data/json/schools/schools_kt_zh.geojson b/data/json/schools/schools_kt_zh.geojson
index 9369345b..fe283363 100644
--- a/data/json/schools/schools_kt_zh.geojson
+++ b/data/json/schools/schools_kt_zh.geojson
@@ -2636,144 +2636,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "way/10743313",
-  "properties": {
-    "addr:city": "Niederglatt",
-    "addr:housenumber": "61",
-    "addr:postcode": "8172",
-    "addr:street": "Grafschaftstrasse",
-    "amenity": "school",
-    "building": "school",
-    "name": "Eichi",
-    "id": "way/10743313"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.5003197,
-          47.4945609
-        ],
-        [
-          8.5001886,
-          47.4943755
-        ],
-        [
-          8.5001062,
-          47.4943565
-        ],
-        [
-          8.5001533,
-          47.4942632
-        ],
-        [
-          8.5000966,
-          47.4941866
-        ],
-        [
-          8.5001515,
-          47.494088
-        ],
-        [
-          8.5002577,
-          47.4940537
-        ],
-        [
-          8.5005611,
-          47.494483
-        ],
-        [
-          8.5003197,
-          47.4945609
-        ]
-      ]
-    ]
-  }
-},
-{
-  "type": "Feature",
-  "id": "way/10743320",
-  "properties": {
-    "addr:city": "Niederglatt",
-    "addr:housenumber": "63",
-    "addr:postcode": "8172",
-    "addr:street": "Grafschaftstrasse",
-    "amenity": "school",
-    "building": "school",
-    "name": "Eichi",
-    "id": "way/10743320"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.4995603,
-          47.4946899
-        ],
-        [
-          8.4994167,
-          47.4944803
-        ],
-        [
-          8.4996539,
-          47.4944041
-        ],
-        [
-          8.4997334,
-          47.4945192
-        ],
-        [
-          8.4998462,
-          47.4944836
-        ],
-        [
-          8.499877,
-          47.4945281
-        ],
-        [
-          8.4998917,
-          47.4945234
-        ],
-        [
-          8.4998952,
-          47.4945285
-        ],
-        [
-          8.4998917,
-          47.4945296
-        ],
-        [
-          8.4999196,
-          47.4945699
-        ],
-        [
-          8.499923,
-          47.4945688
-        ],
-        [
-          8.4999263,
-          47.4945735
-        ],
-        [
-          8.4997929,
-          47.4946157
-        ],
-        [
-          8.4996981,
-          47.4946453
-        ],
-        [
-          8.4995603,
-          47.4946899
-        ]
-      ]
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "way/10861441",
@@ -7625,6 +7487,8 @@
   "properties": {
     "amenity": "school",
     "name": "Schule Rietlen",
+    "operator": "Schule Niederglatt",
+    "operator:type": "public",
     "id": "way/28717271"
   },
   "geometry": {
@@ -41548,112 +41412,6 @@
     ]
   }
 },
-{
-  "type": "Feature",
-  "id": "way/149032652",
-  "properties": {
-    "amenity": "school",
-    "building": "yes",
-    "name": "Echi",
-    "id": "way/149032652"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.4998096,
-          47.4948769
-        ],
-        [
-          8.4996858,
-          47.4946989
-        ],
-        [
-          8.4997257,
-          47.4946857
-        ],
-        [
-          8.4996981,
-          47.4946453
-        ],
-        [
-          8.4997929,
-          47.4946157
-        ],
-        [
-          8.4998341,
-          47.4946729
-        ],
-        [
-          8.4998968,
-          47.494653
-        ],
-        [
-          8.5000086,
-          47.4948126
-        ],
-        [
-          8.4998096,
-          47.4948769
-        ]
-      ]
-    ]
-  }
-},
-{
-  "type": "Feature",
-  "id": "way/149032901",
-  "properties": {
-    "amenity": "school",
-    "building": "yes",
-    "name": "Singsaal Eichi",
-    "id": "way/149032901"
-  },
-  "geometry": {
-    "type": "Polygon",
-    "coordinates": [
-      [
-        [
-          8.4998792,
-          47.4944299
-        ],
-        [
-          8.4997198,
-          47.4944822
-        ],
-        [
-          8.4996101,
-          47.494335
-        ],
-        [
-          8.4996366,
-          47.4943265
-        ],
-        [
-          8.4996409,
-          47.4943326
-        ],
-        [
-          8.4999628,
-          47.4942292
-        ],
-        [
-          8.4999656,
-          47.4942331
-        ],
-        [
-          8.5000193,
-          47.4942158
-        ],
-        [
-          8.4998792,
-          47.4944299
-        ]
-      ]
-    ]
-  }
-},
 {
   "type": "Feature",
   "id": "way/149258974",
@@ -99380,6 +99138,118 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "way/1338168876",
+  "properties": {
+    "amenity": "school",
+    "grades": "7-9",
+    "name": "Schulhaus Eichi",
+    "operator": "Sekundarschulgemeinde Niederhasli Niederglatt",
+    "operator:type": "public",
+    "website": "https://www.eduzis.ch/schulhaus-eichi/",
+    "id": "way/1338168876"
+  },
+  "geometry": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [
+          8.4977852,
+          47.4956365
+        ],
+        [
+          8.4970421,
+          47.4951539
+        ],
+        [
+          8.4970773,
+          47.4950998
+        ],
+        [
+          8.4974809,
+          47.4947708
+        ],
+        [
+          8.4991491,
+          47.4938117
+        ],
+        [
+          8.4994001,
+          47.4936871
+        ],
+        [
+          8.499555,
+          47.4936228
+        ],
+        [
+          8.4997203,
+          47.493562
+        ],
+        [
+          8.4999055,
+          47.4938392
+        ],
+        [
+          8.5000228,
+          47.493798
+        ],
+        [
+          8.5001918,
+          47.4940495
+        ],
+        [
+          8.5003546,
+          47.4939992
+        ],
+        [
+          8.5007773,
+          47.494636
+        ],
+        [
+          8.5001918,
+          47.4948722
+        ],
+        [
+          8.5001098,
+          47.4949148
+        ],
+        [
+          8.5000013,
+          47.4950444
+        ],
+        [
+          8.4999571,
+          47.4950674
+        ],
+        [
+          8.4998903,
+          47.4950734
+        ],
+        [
+          8.4993982,
+          47.4948227
+        ],
+        [
+          8.49919,
+          47.4947852
+        ],
+        [
+          8.4990474,
+          47.494804
+        ],
+        [
+          8.4989187,
+          47.4948679
+        ],
+        [
+          8.4977852,
+          47.4956365
+        ]
+      ]
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "node/256335788",