diff --git a/data/json/defis/defis_dispo_srz.geojson b/data/json/defis/defis_dispo_srz.geojson
index d98cbe32..441834fb 100644
--- a/data/json/defis/defis_dispo_srz.geojson
+++ b/data/json/defis/defis_dispo_srz.geojson
@@ -83998,6 +83998,27 @@
       47.5193418
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/12386355501",
+  "properties": {
+    "defibrillator:location": "Main Entrance Schoolhouse ",
+    "description": "outside of Main Entrance Door",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "no",
+    "opening_hours": "24/7",
+    "operator": "School",
+    "id": "node/12386355501"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.6289903,
+      47.3998845
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/defis/defis_kt_zh.geojson b/data/json/defis/defis_kt_zh.geojson
index d7c065ca..cb536063 100644
--- a/data/json/defis/defis_kt_zh.geojson
+++ b/data/json/defis/defis_kt_zh.geojson
@@ -64964,6 +64964,27 @@
       47.5193418
     ]
   }
+},
+{
+  "type": "Feature",
+  "id": "node/12386355501",
+  "properties": {
+    "defibrillator:location": "Main Entrance Schoolhouse ",
+    "description": "outside of Main Entrance Door",
+    "emergency": "defibrillator",
+    "emergency:phone": "144",
+    "indoor": "no",
+    "opening_hours": "24/7",
+    "operator": "School",
+    "id": "node/12386355501"
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      8.6289903,
+      47.3998845
+    ]
+  }
 }
 ]
 }
diff --git a/data/json/facilities/hospital/hospital_switzerland.geojson b/data/json/facilities/hospital/hospital_switzerland.geojson
index 764925ab..def13f95 100644
--- a/data/json/facilities/hospital/hospital_switzerland.geojson
+++ b/data/json/facilities/hospital/hospital_switzerland.geojson
@@ -54296,8 +54296,8 @@
   "geometry": {
     "type": "Point",
     "coordinates": [
-      6.5813639,
-      46.9032284
+      6.5813526,
+      46.9032859
     ]
   }
 },
diff --git a/data/json/helipad/helipads_switzerland.geojson b/data/json/helipad/helipads_switzerland.geojson
index 7159542d..c39100a5 100644
--- a/data/json/helipad/helipads_switzerland.geojson
+++ b/data/json/helipad/helipads_switzerland.geojson
@@ -9696,6 +9696,7 @@
   "id": "way/976102458",
   "properties": {
     "aeroway": "helipad",
+    "ref": "H2",
     "id": "way/976102458"
   },
   "geometry": {
@@ -9703,72 +9704,72 @@
     "coordinates": [
       [
         [
-          9.5623937,
-          47.4871824
+          9.5623456,
+          47.4871427
         ],
         [
-          9.5623772,
-          47.4871751
+          9.5623291,
+          47.4871354
         ],
         [
-          9.562366,
-          47.4871641
+          9.5623179,
+          47.4871244
         ],
         [
-          9.5623618,
-          47.487151
+          9.5623137,
+          47.4871113
         ],
         [
-          9.5623653,
-          47.4871378
+          9.5623172,
+          47.4870981
         ],
         [
-          9.562376,
-          47.4871266
+          9.5623279,
+          47.4870869
         ],
         [
-          9.5623925,
-          47.4871188
+          9.5623444,
+          47.4870791
         ],
         [
-          9.5624122,
-          47.4871159
+          9.5623641,
+          47.4870762
         ],
         [
-          9.5624321,
-          47.4871184
+          9.562384,
+          47.4870787
         ],
         [
-          9.5624487,
-          47.4871258
+          9.5624006,
+          47.4870861
         ],
         [
-          9.5624599,
-          47.487137
+          9.5624118,
+          47.4870973
         ],
         [
-          9.5624639,
-          47.4871502
+          9.5624158,
+          47.4871105
         ],
         [
-          9.5624602,
-          47.4871634
+          9.5624121,
+          47.4871237
         ],
         [
-          9.5624492,
-          47.4871746
+          9.5624011,
+          47.4871349
         ],
         [
-          9.5624328,
-          47.4871822
+          9.5623847,
+          47.4871425
         ],
         [
-          9.5624133,
-          47.4871849
+          9.5623652,
+          47.4871452
         ],
         [
-          9.5623937,
-          47.4871824
+          9.5623456,
+          47.4871427
         ]
       ]
     ]
@@ -24483,6 +24484,258 @@
     ]
   }
 },
+{
+  "type": "Feature",
+  "id": "way/1339117799",
+  "properties": {
+    "aeroway": "helipad",
+    "ref": "H1",
+    "id": "way/1339117799"
+  },
+  "geometry": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [
+          9.5623125,
+          47.4868327
+        ],
+        [
+          9.562296,
+          47.4868254
+        ],
+        [
+          9.5622848,
+          47.4868144
+        ],
+        [
+          9.5622806,
+          47.4868013
+        ],
+        [
+          9.5622841,
+          47.4867881
+        ],
+        [
+          9.5622948,
+          47.4867769
+        ],
+        [
+          9.5623113,
+          47.4867691
+        ],
+        [
+          9.562331,
+          47.4867662
+        ],
+        [
+          9.5623509,
+          47.4867687
+        ],
+        [
+          9.5623675,
+          47.4867761
+        ],
+        [
+          9.5623787,
+          47.4867873
+        ],
+        [
+          9.5623827,
+          47.4868005
+        ],
+        [
+          9.562379,
+          47.4868137
+        ],
+        [
+          9.562368,
+          47.4868249
+        ],
+        [
+          9.5623516,
+          47.4868325
+        ],
+        [
+          9.5623321,
+          47.4868352
+        ],
+        [
+          9.5623125,
+          47.4868327
+        ]
+      ]
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "way/1339117800",
+  "properties": {
+    "aeroway": "helipad",
+    "ref": "H4",
+    "id": "way/1339117800"
+  },
+  "geometry": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [
+          9.5617952,
+          47.4872024
+        ],
+        [
+          9.5617787,
+          47.4871951
+        ],
+        [
+          9.5617675,
+          47.4871841
+        ],
+        [
+          9.5617633,
+          47.487171
+        ],
+        [
+          9.5617668,
+          47.4871578
+        ],
+        [
+          9.5617775,
+          47.4871466
+        ],
+        [
+          9.561794,
+          47.4871388
+        ],
+        [
+          9.5618137,
+          47.4871359
+        ],
+        [
+          9.5618336,
+          47.4871384
+        ],
+        [
+          9.5618502,
+          47.4871458
+        ],
+        [
+          9.5618614,
+          47.487157
+        ],
+        [
+          9.5618654,
+          47.4871702
+        ],
+        [
+          9.5618617,
+          47.4871834
+        ],
+        [
+          9.5618507,
+          47.4871946
+        ],
+        [
+          9.5618343,
+          47.4872022
+        ],
+        [
+          9.5618148,
+          47.4872049
+        ],
+        [
+          9.5617952,
+          47.4872024
+        ]
+      ]
+    ]
+  }
+},
+{
+  "type": "Feature",
+  "id": "way/1339117801",
+  "properties": {
+    "aeroway": "helipad",
+    "ref": "H3",
+    "id": "way/1339117801"
+  },
+  "geometry": {
+    "type": "Polygon",
+    "coordinates": [
+      [
+        [
+          9.5620707,
+          47.4871724
+        ],
+        [
+          9.5620542,
+          47.4871651
+        ],
+        [
+          9.562043,
+          47.4871541
+        ],
+        [
+          9.5620388,
+          47.487141
+        ],
+        [
+          9.5620423,
+          47.4871278
+        ],
+        [
+          9.562053,
+          47.4871166
+        ],
+        [
+          9.5620695,
+          47.4871088
+        ],
+        [
+          9.5620892,
+          47.4871059
+        ],
+        [
+          9.5621091,
+          47.4871084
+        ],
+        [
+          9.5621257,
+          47.4871158
+        ],
+        [
+          9.5621369,
+          47.487127
+        ],
+        [
+          9.5621409,
+          47.4871402
+        ],
+        [
+          9.5621372,
+          47.4871534
+        ],
+        [
+          9.5621262,
+          47.4871646
+        ],
+        [
+          9.5621098,
+          47.4871722
+        ],
+        [
+          9.5620903,
+          47.4871749
+        ],
+        [
+          9.5620707,
+          47.4871724
+        ]
+      ]
+    ]
+  }
+},
 {
   "type": "Feature",
   "id": "node/822278390",
diff --git a/data/json/schools/schools_dispo_srz.geojson b/data/json/schools/schools_dispo_srz.geojson
index 1787461a..5dc3e453 100644
--- a/data/json/schools/schools_dispo_srz.geojson
+++ b/data/json/schools/schools_dispo_srz.geojson
@@ -50200,6 +50200,10 @@
           8.5448029,
           47.5131176
         ],
+        [
+          8.5447732,
+          47.5131136
+        ],
         [
           8.5448015,
           47.5130197
diff --git a/data/json/schools/schools_kt_zh.geojson b/data/json/schools/schools_kt_zh.geojson
index fe283363..84cd2ec6 100644
--- a/data/json/schools/schools_kt_zh.geojson
+++ b/data/json/schools/schools_kt_zh.geojson
@@ -44243,6 +44243,10 @@
           8.5448029,
           47.5131176
         ],
+        [
+          8.5447732,
+          47.5131136
+        ],
         [
           8.5448015,
           47.5130197