diff --git a/data/csv/defis/defis_dispo_srz.csv b/data/csv/defis/defis_dispo_srz.csv
index ffeb4e0e..9ecb6bdf 100644
--- a/data/csv/defis/defis_dispo_srz.csv
+++ b/data/csv/defis/defis_dispo_srz.csv
@@ -3806,3 +3806,4 @@ FeatureCollection,"{'type': 'Feature', 'id': 'node/12378637301', 'properties': {
 FeatureCollection,"{'type': 'Feature', 'id': 'node/12382428301', 'properties': {'access': 'yes', 'defibrillator:location': 'Eingang Schluefweg HALLE', 'emergency': 'defibrillator', 'emergency:phone': '144', 'indoor': 'no', 'opening_hours': '24/7', 'operator': 'Stadt Kloten', 'phone': '+41 44 815 11 11', 'source': 'local_knowledge, defikarte.ch', 'id': 'node/12382428301'}, 'geometry': {'type': 'Point', 'coordinates': [8.5838789, 47.4423114]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/12382659001', 'properties': {'access': 'private', 'defibrillator:location': 'Trakt A, 3. Stock, Siemens Mobility AG, im Gang', 'description': 'Läuten bei Eingangstüre Siemens Mobility im Trakt A, 3. Stock', 'emergency': 'defibrillator', 'emergency:phone': '144', 'indoor': 'yes', 'level': '3', 'opening_hours': 'Mo-Fr 09:00 - 16:00', 'operator': 'Siemens Mobility AG', 'id': 'node/12382659001'}, 'geometry': {'type': 'Point', 'coordinates': [8.4291748, 47.1472082]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/12384615501', 'properties': {'access': 'yes', 'defibrillator:location': 'Büro - Eingang- links', 'description': 'Zoll', 'emergency': 'defibrillator', 'emergency:phone': '144', 'indoor': 'yes', 'level': '0', 'opening_hours': '7:30 - 17:00', 'operator': 'Firma ', 'phone': '+41 52 633 42 42 ', 'source': 'local_knowledge, defikarte.ch', 'id': 'node/12384615501'}, 'geometry': {'type': 'Point', 'coordinates': [8.6466479, 47.5193418]}}"
+FeatureCollection,"{'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/csv/defis/defis_kt_zh.csv b/data/csv/defis/defis_kt_zh.csv
index b5148c66..1581f2ab 100644
--- a/data/csv/defis/defis_kt_zh.csv
+++ b/data/csv/defis/defis_kt_zh.csv
@@ -2922,3 +2922,4 @@ FeatureCollection,"{'type': 'Feature', 'id': 'node/12378632301', 'properties': {
 FeatureCollection,"{'type': 'Feature', 'id': 'node/12378637301', 'properties': {'access': 'yes', 'defibrillator:location': 'Vogelsangstrasse 14 8307 Effretikon', 'description': '7/24 365 Tage', 'emergency': 'defibrillator', 'emergency:phone': '144', 'indoor': 'no', 'operator': 'Post CH AG', 'phone': '+41584537818', 'id': 'node/12378637301'}, 'geometry': {'type': 'Point', 'coordinates': [8.6822816, 47.4201936]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/12382428301', 'properties': {'access': 'yes', 'defibrillator:location': 'Eingang Schluefweg HALLE', 'emergency': 'defibrillator', 'emergency:phone': '144', 'indoor': 'no', 'opening_hours': '24/7', 'operator': 'Stadt Kloten', 'phone': '+41 44 815 11 11', 'source': 'local_knowledge, defikarte.ch', 'id': 'node/12382428301'}, 'geometry': {'type': 'Point', 'coordinates': [8.5838789, 47.4423114]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/12384615501', 'properties': {'access': 'yes', 'defibrillator:location': 'Büro - Eingang- links', 'description': 'Zoll', 'emergency': 'defibrillator', 'emergency:phone': '144', 'indoor': 'yes', 'level': '0', 'opening_hours': '7:30 - 17:00', 'operator': 'Firma ', 'phone': '+41 52 633 42 42 ', 'source': 'local_knowledge, defikarte.ch', 'id': 'node/12384615501'}, 'geometry': {'type': 'Point', 'coordinates': [8.6466479, 47.5193418]}}"
+FeatureCollection,"{'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/csv/facilities/hospital/hospital_switzerland.csv b/data/csv/facilities/hospital/hospital_switzerland.csv
index 572bd04c..2a43ce84 100644
--- a/data/csv/facilities/hospital/hospital_switzerland.csv
+++ b/data/csv/facilities/hospital/hospital_switzerland.csv
@@ -574,7 +574,7 @@ FeatureCollection,"{'type': 'Feature', 'id': 'node/9166788679', 'properties': {'
 FeatureCollection,"{'type': 'Feature', 'id': 'node/9179770358', 'properties': {'amenity': 'clinic', 'email': 'rapperswil@rodiag.ch', 'healthcare': 'clinic', 'healthcare:speciality': 'radiology', 'name': 'RODIAG Diagnostic Centers Röntgeninstitut', 'phone': '+41 58 401 14 00', 'website': 'https://www.rodiag.ch/default.asp?langid=de&siteid=1&id=1011000', 'id': 'node/9179770358'}, 'geometry': {'type': 'Point', 'coordinates': [8.8239603, 47.2280885]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/9204297722', 'properties': {'addr:housenumber': '37', 'addr:street': 'Route de Sonloup', 'amenity': 'hospital', 'emergency': 'no', 'healthcare': 'rehabilitation', 'name': 'Clinic Les Alpes', 'website': 'https://www.cliniclesalpes.com/', 'id': 'node/9204297722'}, 'geometry': {'type': 'Point', 'coordinates': [6.9390021, 46.4574666]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/9209001816', 'properties': {'addr:city': 'Zürich', 'addr:housenumber': '18', 'addr:postcode': '8001', 'addr:street': 'Goethestrasse', 'alt_name': 'Medizinisch Radiologische Institut', 'amenity': 'clinic', 'email': 'stadelhofen@mri-roentgen.ch', 'healthcare': 'clinic', 'name': 'MRI Stadelhofen', 'phone': '+41 44 226 20 90', 'website': 'https://www.mri-roentgen.ch/de/standorte/mri-stadelhofen/', 'id': 'node/9209001816'}, 'geometry': {'type': 'Point', 'coordinates': [8.548012, 47.3659083]}}"
-FeatureCollection,"{'type': 'Feature', 'id': 'node/9263946618', 'properties': {'addr:city': 'Fleurier', 'addr:housenumber': '5a', 'addr:postcode': '2114', 'addr:street': 'Avenue de la Gare', 'amenity': 'clinic', 'healthcare': 'clinic', 'name': 'Permanence Volta', 'id': 'node/9263946618'}, 'geometry': {'type': 'Point', 'coordinates': [6.5813638999999995, 46.9032284]}}"
+FeatureCollection,"{'type': 'Feature', 'id': 'node/9263946618', 'properties': {'addr:city': 'Fleurier', 'addr:housenumber': '5a', 'addr:postcode': '2114', 'addr:street': 'Avenue de la Gare', 'amenity': 'clinic', 'healthcare': 'clinic', 'name': 'Permanence Volta', 'id': 'node/9263946618'}, 'geometry': {'type': 'Point', 'coordinates': [6.5813526, 46.9032859]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/9326879902', 'properties': {'addr:city': 'Sursee', 'addr:housenumber': '16', 'addr:postcode': '6210', 'addr:street': 'Spitalstrasse', 'amenity': 'hospital', 'emergency': 'yes', 'healthcare': 'hospital', 'healthcare:speciality': 'general', 'name': 'Luzerner Kantonsspital Sursee', 'id': 'node/9326879902'}, 'geometry': {'type': 'Point', 'coordinates': [8.1174197, 47.1682642]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/9350177868', 'properties': {'addr:city': 'Marly', 'addr:housenumber': '1', 'addr:postcode': '1723', 'addr:street': 'Impasse du Nouveau-Marché', 'amenity': 'clinic', 'healthcare': 'clinic', 'name': 'Cabinet médical', 'id': 'node/9350177868'}, 'geometry': {'type': 'Point', 'coordinates': [7.1487807, 46.7830464]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/9350177869', 'properties': {'addr:city': 'Marly', 'addr:housenumber': '3', 'addr:postcode': '1723', 'addr:street': 'Impasse du Nouveau-Marché', 'amenity': 'clinic', 'healthcare': 'clinic', 'name': 'Groupe médical Marly', 'id': 'node/9350177869'}, 'geometry': {'type': 'Point', 'coordinates': [7.1487008, 46.7831713]}}"
diff --git a/data/csv/helipad/helipads_switzerland.csv b/data/csv/helipad/helipads_switzerland.csv
index 6e9f46ec..45662a83 100644
--- a/data/csv/helipad/helipads_switzerland.csv
+++ b/data/csv/helipad/helipads_switzerland.csv
@@ -194,7 +194,7 @@ FeatureCollection,"{'type': 'Feature', 'id': 'way/958825599', 'properties': {'ae
 FeatureCollection,"{'type': 'Feature', 'id': 'way/958825600', 'properties': {'aeroway': 'helipad', 'ref': '1', 'id': 'way/958825600'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[7.0713469, 46.7550423], [7.0713303, 46.7549351], [7.0714762, 46.7549244], [7.0714928, 46.7550316], [7.0713469, 46.7550423]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/960162771', 'properties': {'aeroway': 'helipad', 'id': 'way/960162771'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[7.9994194, 46.32252], [7.99944, 46.322513], [7.9994628, 46.3225111], [7.9994843, 46.3225143], [7.9995031999999995, 46.322522], [7.9995175, 46.3225335], [7.9995259, 46.3225475], [7.9995273000000005, 46.3225627], [7.9995217, 46.3225773], [7.9995096, 46.32259], [7.9994923, 46.3225994], [7.9994716, 46.3226044], [7.9994496999999996, 46.3226047], [7.9994278, 46.3225998], [7.9994095, 46.3225902], [7.9993969, 46.3225769], [7.9993914, 46.3225615], [7.9993936, 46.3225457], [7.9994033, 46.3225313], [7.9994194, 46.32252]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/961942689', 'properties': {'aeroway': 'helipad', 'surface': 'asphalt', 'id': 'way/961942689'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[9.6858639, 46.9709375], [9.6858013, 46.9708477], [9.6859253, 46.9708075], [9.6859878, 46.9708973], [9.6858639, 46.9709375]]]}}"
-FeatureCollection,"{'type': 'Feature', 'id': 'way/976102458', 'properties': {'aeroway': 'helipad', 'id': 'way/976102458'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[9.5623937, 47.4871824], [9.5623772, 47.4871751], [9.562366, 47.4871641], [9.5623618, 47.487151], [9.5623653, 47.4871378], [9.562376, 47.4871266], [9.5623925, 47.4871188], [9.5624122, 47.4871159], [9.5624321, 47.4871184], [9.562448700000001, 47.4871258], [9.5624599, 47.487137], [9.562463900000001, 47.4871502], [9.5624602, 47.4871634], [9.5624492, 47.4871746], [9.5624328, 47.4871822], [9.5624133, 47.4871849], [9.5623937, 47.4871824]]]}}"
+FeatureCollection,"{'type': 'Feature', 'id': 'way/976102458', 'properties': {'aeroway': 'helipad', 'ref': 'H2', 'id': 'way/976102458'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[9.5623456, 47.4871427], [9.5623291, 47.4871354], [9.5623179, 47.4871244], [9.5623137, 47.4871113], [9.5623172, 47.4870981], [9.5623279, 47.4870869], [9.5623444, 47.4870791], [9.5623641, 47.4870762], [9.562384, 47.4870787], [9.5624006, 47.4870861], [9.5624118, 47.4870973], [9.5624158, 47.4871105], [9.5624121, 47.4871237], [9.5624011, 47.4871349], [9.562384699999999, 47.4871425], [9.5623652, 47.4871452], [9.5623456, 47.4871427]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/979417432', 'properties': {'aeroway': 'helipad', 'id': 'way/979417432'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[7.4754712, 45.9898295], [7.4754621, 45.9897917], [7.4755582, 45.9897817], [7.4755666, 45.9898198], [7.4754712, 45.9898295]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/981259174', 'properties': {'aeroway': 'helipad', 'layer': '1', 'id': 'way/981259174'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[7.4033831, 46.0837932], [7.4033953, 46.083763], [7.4034182, 46.0837062], [7.4035451, 46.0837309], [7.40351, 46.0838178], [7.4033831, 46.0837932]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/984421419', 'properties': {'aeroway': 'helipad', 'id': 'way/984421419'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.924637, 46.0788199], [8.9246543, 46.0788137], [8.9246736, 46.078812], [8.9246909, 46.0788145], [8.9247062, 46.0788206], [8.9247181, 46.0788297], [8.9247253, 46.0788409], [8.9247271, 46.0788531], [8.9247234, 46.0788651], [8.9247145, 46.0788757], [8.9247012, 46.0788839], [8.924685, 46.0788888], [8.9246674, 46.0788899], [8.9246485, 46.0788868], [8.9246323, 46.0788793], [8.9246207, 46.0788685], [8.9246151, 46.0788556], [8.924616199999999, 46.0788422], [8.924623799999999, 46.0788298], [8.924637, 46.0788199]]]}}"
@@ -440,6 +440,9 @@ FeatureCollection,"{'type': 'Feature', 'id': 'way/1301155025', 'properties': {'a
 FeatureCollection,"{'type': 'Feature', 'id': 'way/1301155026', 'properties': {'aeroway': 'helipad', 'icao': 'LSZS', 'ref': 'Rega 9', 'id': 'way/1301155026'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[9.8782116, 46.5304133], [9.8782266, 46.5304095], [9.8782425, 46.5304093], [9.8782577, 46.5304126], [9.8782705, 46.5304192], [9.8782795, 46.5304282], [9.8782838, 46.5304388], [9.8782828, 46.5304498], [9.8782767, 46.5304599], [9.8782662, 46.5304681], [9.8782523, 46.5304736], [9.8782366, 46.5304756], [9.8782208, 46.530474], [9.8782066, 46.530469], [9.8781956, 46.5304611], [9.8781888, 46.5304511], [9.8781872, 46.5304402], [9.8781908, 46.5304295], [9.8781992, 46.5304202], [9.8782116, 46.5304133]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/1302663750', 'properties': {'aeroway': 'helipad', 'id': 'way/1302663750'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.0527523, 46.5005671], [8.0527429, 46.5005295], [8.0528038, 46.5005223], [8.0528131, 46.5005599], [8.0527523, 46.5005671]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/1330130280', 'properties': {'aeroway': 'helipad', 'emergency': 'landing_site', 'icao': 'LSHJ', 'name': 'Heliport Kispi Zürich', 'start_date': '2024-11-02', 'surface': 'paved', 'id': 'way/1330130280'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5712412, 47.3518317], [8.5713085, 47.3516578], [8.5715597, 47.3517025], [8.5714924, 47.3518764], [8.5712412, 47.3518317]]]}}"
+FeatureCollection,"{'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]]]}}"
+FeatureCollection,"{'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.561763299999999, 47.487171], [9.561766800000001, 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]]]}}"
+FeatureCollection,"{'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.562089199999999, 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]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/822278390', 'properties': {'aeroway': 'helipad', 'id': 'node/822278390'}, 'geometry': {'type': 'Point', 'coordinates': [8.5944129, 46.3267758]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/1323054911', 'properties': {'aeroway': 'helipad', 'name': 'Ausweichlandeplatz USZ', 'id': 'node/1323054911'}, 'geometry': {'type': 'Point', 'coordinates': [8.5513244, 47.3741908]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'node/1334052008', 'properties': {'aeroway': 'helipad', 'id': 'node/1334052008'}, 'geometry': {'type': 'Point', 'coordinates': [8.5541384, 46.3715486]}}"
diff --git a/data/csv/schools/schools_dispo_srz.csv b/data/csv/schools/schools_dispo_srz.csv
index 20dee7d6..215056c4 100644
--- a/data/csv/schools/schools_dispo_srz.csv
+++ b/data/csv/schools/schools_dispo_srz.csv
@@ -564,7 +564,7 @@ FeatureCollection,"{'type': 'Feature', 'id': 'way/158493240', 'properties': {'am
 FeatureCollection,"{'type': 'Feature', 'id': 'way/158555561', 'properties': {'addr:city': 'Kloten', 'addr:housenumber': '9', 'addr:postcode': '8302', 'addr:street': 'Lerchenweg', 'amenity': 'school', 'building': 'school', 'name': 'Schulhaus Spitz Oberstufe', 'roof:shape': 'flat', 'source': 'bing', 'id': 'way/158555561'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5868612, 47.4443415], [8.5868959, 47.4445313], [8.5869004, 47.4445605], [8.5865901, 47.4445845], [8.5865513, 47.4443667], [8.5868612, 47.4443415]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/158608433', 'properties': {'addr:city': 'Bülach', 'addr:housenumber': '51', 'addr:postcode': '8180', 'addr:street': 'Unterweg', 'amenity': 'school', 'name': 'Schule Hohfuri', 'id': 'way/158608433'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5428334, 47.5274077], [8.5428442, 47.5270468], [8.5428464, 47.5270036], [8.5428236, 47.5270029], [8.5424622, 47.526992], [8.5424589, 47.5269375], [8.5423638, 47.5269187], [8.542346, 47.526029], [8.5430463, 47.5258194], [8.5436184, 47.5258843], [8.5439291, 47.5259054], [8.5440489, 47.5261497], [8.5440422, 47.5264235], [8.5442661, 47.5264278], [8.544225, 47.5270676], [8.544198699999999, 47.527426], [8.5435913, 47.5274125], [8.5428334, 47.5274077]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/158610812', 'properties': {'amenity': 'school', 'description': 'Kantonsschule Zürcher Unterland, Berufsschule Bülach & Primarschulhaus Schwerzgrueb', 'id': 'way/158610812'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5454381, 47.5152422], [8.5457431, 47.514967], [8.5464702, 47.5143165], [8.5464913, 47.5143045], [8.5489752, 47.5163486], [8.5490173, 47.5164061], [8.548763600000001, 47.5164825], [8.5485153, 47.5165558], [8.5485502, 47.5165961], [8.5486272, 47.516685], [8.5486852, 47.5167551], [8.5487824, 47.5168732], [8.5488622, 47.5169298], [8.5489698, 47.5169559], [8.5501486, 47.5170579], [8.5503218, 47.5170739], [8.5504371, 47.5170963], [8.5505293, 47.5171317], [8.5506312, 47.5171874], [8.5507147, 47.5172611], [8.550768099999999, 47.517335], [8.5508115, 47.5174533], [8.5507292, 47.5178978], [8.5505512, 47.5188106], [8.5502171, 47.5187772], [8.5499609, 47.5187646], [8.5498082, 47.5187646], [8.5494066, 47.5187926], [8.5489604, 47.5188128], [8.5482649, 47.518802], [8.5480785, 47.5187049], [8.5474609, 47.5186458], [8.5467836, 47.5185845], [8.5469004, 47.5179675], [8.5469669, 47.5176617], [8.5470396, 47.5175246], [8.547433999999999, 47.5171218], [8.5476783, 47.5169695], [8.5476065, 47.516888], [8.5474635, 47.5167944], [8.5466341, 47.5163137], [8.5456124, 47.515767], [8.5454514, 47.5156818], [8.5453813, 47.5156441], [8.5451353, 47.515511599999996], [8.5454381, 47.5152422]]]}}"
-FeatureCollection,"{'type': 'Feature', 'id': 'way/158853267', 'properties': {'amenity': 'school', 'name': 'Oberstufenschulhaus Mettmenriet', 'id': 'way/158853267'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5448015, 47.5130197], [8.544830900000001, 47.512933], [8.5449313, 47.5126833], [8.5449738, 47.5125948], [8.5449799, 47.5125811], [8.544988, 47.512563], [8.5450332, 47.5124443], [8.5450575, 47.5121861], [8.5450908, 47.5120622], [8.5451228, 47.5119803], [8.545156, 47.5118817], [8.5451668, 47.5118421], [8.5451894, 47.5116469], [8.5452311, 47.5114535], [8.5452582, 47.5113927], [8.546864, 47.5118049], [8.5473118, 47.5124043], [8.5471057, 47.5124894], [8.546243, 47.5128661], [8.5458407, 47.5130435], [8.5456419, 47.5131055], [8.5453623, 47.513151], [8.5452281, 47.513154], [8.5451041, 47.5131497], [8.5448029, 47.5131176], [8.5448015, 47.5130197]]]}}"
+FeatureCollection,"{'type': 'Feature', 'id': 'way/158853267', 'properties': {'amenity': 'school', 'name': 'Oberstufenschulhaus Mettmenriet', 'id': 'way/158853267'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5448015, 47.5130197], [8.544830900000001, 47.512933], [8.5449313, 47.5126833], [8.5449738, 47.5125948], [8.5449799, 47.5125811], [8.544988, 47.512563], [8.5450332, 47.5124443], [8.5450575, 47.5121861], [8.5450908, 47.5120622], [8.5451228, 47.5119803], [8.545156, 47.5118817], [8.5451668, 47.5118421], [8.5451894, 47.5116469], [8.5452311, 47.5114535], [8.5452582, 47.5113927], [8.546864, 47.5118049], [8.5473118, 47.5124043], [8.5471057, 47.5124894], [8.546243, 47.5128661], [8.5458407, 47.5130435], [8.5456419, 47.5131055], [8.5453623, 47.513151], [8.5452281, 47.513154], [8.5451041, 47.5131497], [8.5448029, 47.5131176], [8.5447732, 47.5131136], [8.5448015, 47.5130197]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/159097698', 'properties': {'addr:city': 'Schaffhausen', 'addr:housenumber': '2', 'addr:postcode': '8203', 'addr:street': 'Oberer Schulweg', 'amenity': 'school', 'building': 'school', 'name': 'Sekundarschule Buchthalen', 'source': 'GIS Schaffhausen', 'id': 'way/159097698'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.6533365, 47.6981293], [8.6533426, 47.6981216], [8.6533455, 47.6981222], [8.6534202, 47.6980189], [8.6534176, 47.698018], [8.6534246, 47.6980094], [8.6534351, 47.6980131], [8.6534344, 47.6980153], [8.6536789, 47.6980961], [8.6536801, 47.6980936], [8.6536921, 47.6980976], [8.653603799999999, 47.698214899999996], [8.6535477, 47.6981967], [8.6535431, 47.6982031], [8.6534951, 47.6981874], [8.6534862, 47.698193], [8.6534764, 47.6981958], [8.6534605, 47.6981958], [8.653454, 47.698194], [8.6534479, 47.6981907], [8.6534421, 47.6981862], [8.6534381, 47.6981799], [8.6534389, 47.6981701], [8.6534428, 47.6981627], [8.6533499, 47.6981313], [8.6533483, 47.6981331], [8.6533365, 47.6981293]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/159146505', 'properties': {'addr:city': 'Dörflingen', 'addr:country': 'CH', 'addr:housenumber': '6', 'addr:postcode': '8239', 'addr:street': 'Schulstrasse', 'amenity': 'school', 'building': 'school', 'email': 'psdoerflingen@schulensh.ch', 'grades': '7-12', 'name': 'Neues Schulhaus', 'phone': '052 654 17 48', 'source': 'local knowledge', 'website': 'https://www.schuledoerflingen.ch', 'id': 'way/159146505'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.7235418, 47.7071305], [8.7235038, 47.70706], [8.7235382, 47.7070516], [8.723583, 47.7070406], [8.7235246, 47.7069373], [8.7235103, 47.706912], [8.7238138, 47.7068332], [8.7238354, 47.7068693], [8.7238649, 47.7068622], [8.7238819, 47.7068946], [8.7239173, 47.7069596], [8.7238638, 47.7069727], [8.7239006, 47.7070369], [8.7235418, 47.7071305]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/159146557', 'properties': {'addr:city': 'Dörflingen', 'addr:country': 'CH', 'addr:housenumber': '4', 'addr:postcode': '8239', 'addr:street': 'Schulstrasse', 'amenity': 'school', 'building': 'school', 'email': 'psdoerflingen@schulensh.ch', 'grades': '7-12', 'name': 'Altes Schulhaus', 'phone': '052 657 28 15', 'source': 'local knowledge', 'website': 'https://www.schuledoerflingen.ch/', 'id': 'way/159146557'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.723334, 47.7066662], [8.7232621, 47.7065756], [8.723480200000001, 47.7064971], [8.7235532, 47.706589], [8.7235285, 47.7065979], [8.7235592, 47.7066365], [8.7234534, 47.7066746], [8.7234217, 47.7066347], [8.723334, 47.7066662]]]}}"
diff --git a/data/csv/schools/schools_kt_zh.csv b/data/csv/schools/schools_kt_zh.csv
index 7be90da3..cb6857e7 100644
--- a/data/csv/schools/schools_kt_zh.csv
+++ b/data/csv/schools/schools_kt_zh.csv
@@ -488,7 +488,7 @@ FeatureCollection,"{'type': 'Feature', 'id': 'way/158493240', 'properties': {'am
 FeatureCollection,"{'type': 'Feature', 'id': 'way/158555561', 'properties': {'addr:city': 'Kloten', 'addr:housenumber': '9', 'addr:postcode': '8302', 'addr:street': 'Lerchenweg', 'amenity': 'school', 'building': 'school', 'name': 'Schulhaus Spitz Oberstufe', 'roof:shape': 'flat', 'source': 'bing', 'id': 'way/158555561'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5868612, 47.4443415], [8.5868959, 47.4445313], [8.5869004, 47.4445605], [8.5865901, 47.4445845], [8.5865513, 47.4443667], [8.5868612, 47.4443415]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/158608433', 'properties': {'addr:city': 'Bülach', 'addr:housenumber': '51', 'addr:postcode': '8180', 'addr:street': 'Unterweg', 'amenity': 'school', 'name': 'Schule Hohfuri', 'id': 'way/158608433'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5428334, 47.5274077], [8.5428442, 47.5270468], [8.5428464, 47.5270036], [8.5428236, 47.5270029], [8.5424622, 47.526992], [8.5424589, 47.5269375], [8.5423638, 47.5269187], [8.542346, 47.526029], [8.5430463, 47.5258194], [8.5436184, 47.5258843], [8.5439291, 47.5259054], [8.5440489, 47.5261497], [8.5440422, 47.5264235], [8.5442661, 47.5264278], [8.544225, 47.5270676], [8.544198699999999, 47.527426], [8.5435913, 47.5274125], [8.5428334, 47.5274077]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/158610812', 'properties': {'amenity': 'school', 'description': 'Kantonsschule Zürcher Unterland, Berufsschule Bülach & Primarschulhaus Schwerzgrueb', 'id': 'way/158610812'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5454381, 47.5152422], [8.5457431, 47.514967], [8.5464702, 47.5143165], [8.5464913, 47.5143045], [8.5489752, 47.5163486], [8.5490173, 47.5164061], [8.548763600000001, 47.5164825], [8.5485153, 47.5165558], [8.5485502, 47.5165961], [8.5486272, 47.516685], [8.5486852, 47.5167551], [8.5487824, 47.5168732], [8.5488622, 47.5169298], [8.5489698, 47.5169559], [8.5501486, 47.5170579], [8.5503218, 47.5170739], [8.5504371, 47.5170963], [8.5505293, 47.5171317], [8.5506312, 47.5171874], [8.5507147, 47.5172611], [8.550768099999999, 47.517335], [8.5508115, 47.5174533], [8.5507292, 47.5178978], [8.5505512, 47.5188106], [8.5502171, 47.5187772], [8.5499609, 47.5187646], [8.5498082, 47.5187646], [8.5494066, 47.5187926], [8.5489604, 47.5188128], [8.5482649, 47.518802], [8.5480785, 47.5187049], [8.5474609, 47.5186458], [8.5467836, 47.5185845], [8.5469004, 47.5179675], [8.5469669, 47.5176617], [8.5470396, 47.5175246], [8.547433999999999, 47.5171218], [8.5476783, 47.5169695], [8.5476065, 47.516888], [8.5474635, 47.5167944], [8.5466341, 47.5163137], [8.5456124, 47.515767], [8.5454514, 47.5156818], [8.5453813, 47.5156441], [8.5451353, 47.515511599999996], [8.5454381, 47.5152422]]]}}"
-FeatureCollection,"{'type': 'Feature', 'id': 'way/158853267', 'properties': {'amenity': 'school', 'name': 'Oberstufenschulhaus Mettmenriet', 'id': 'way/158853267'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5448015, 47.5130197], [8.544830900000001, 47.512933], [8.5449313, 47.5126833], [8.5449738, 47.5125948], [8.5449799, 47.5125811], [8.544988, 47.512563], [8.5450332, 47.5124443], [8.5450575, 47.5121861], [8.5450908, 47.5120622], [8.5451228, 47.5119803], [8.545156, 47.5118817], [8.5451668, 47.5118421], [8.5451894, 47.5116469], [8.5452311, 47.5114535], [8.5452582, 47.5113927], [8.546864, 47.5118049], [8.5473118, 47.5124043], [8.5471057, 47.5124894], [8.546243, 47.5128661], [8.5458407, 47.5130435], [8.5456419, 47.5131055], [8.5453623, 47.513151], [8.5452281, 47.513154], [8.5451041, 47.5131497], [8.5448029, 47.5131176], [8.5448015, 47.5130197]]]}}"
+FeatureCollection,"{'type': 'Feature', 'id': 'way/158853267', 'properties': {'amenity': 'school', 'name': 'Oberstufenschulhaus Mettmenriet', 'id': 'way/158853267'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.5448015, 47.5130197], [8.544830900000001, 47.512933], [8.5449313, 47.5126833], [8.5449738, 47.5125948], [8.5449799, 47.5125811], [8.544988, 47.512563], [8.5450332, 47.5124443], [8.5450575, 47.5121861], [8.5450908, 47.5120622], [8.5451228, 47.5119803], [8.545156, 47.5118817], [8.5451668, 47.5118421], [8.5451894, 47.5116469], [8.5452311, 47.5114535], [8.5452582, 47.5113927], [8.546864, 47.5118049], [8.5473118, 47.5124043], [8.5471057, 47.5124894], [8.546243, 47.5128661], [8.5458407, 47.5130435], [8.5456419, 47.5131055], [8.5453623, 47.513151], [8.5452281, 47.513154], [8.5451041, 47.5131497], [8.5448029, 47.5131176], [8.5447732, 47.5131136], [8.5448015, 47.5130197]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/159355420', 'properties': {'addr:city': 'Schlieren', 'addr:housenumber': '10', 'addr:postcode': '8952', 'addr:street': 'Rohrstrasse', 'amenity': 'school', 'building': 'school', 'name': 'Schulhaus Zelgli', 'source': 'bing', 'id': 'way/159355420'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.4463143, 47.4047514], [8.4463233, 47.4046214], [8.4466402, 47.4046315], [8.4466311, 47.4047615], [8.4463143, 47.4047514]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/161147150', 'properties': {'addr:city': 'Zumikon', 'addr:housenumber': '30', 'addr:postcode': '8126', 'addr:street': 'Farlifangstrasse', 'amenity': 'school', 'building': 'school', 'name': 'Schulhaus Farlifang', 'uzh_landmark': 'true', 'id': 'way/161147150'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.6226695, 47.3339135], [8.6227527, 47.3338008], [8.6228814, 47.333839], [8.6228975, 47.3338135], [8.6233052, 47.3339407], [8.6233186, 47.3339244], [8.6234447, 47.3339626], [8.6232972, 47.3341752], [8.6233267, 47.3341825], [8.6231604, 47.3344261], [8.6231309, 47.3344152], [8.6230477, 47.3345315], [8.6229485, 47.3344934], [8.6228432, 47.3344596], [8.6229163, 47.3343516], [8.6229807, 47.3343716], [8.623088, 47.334208], [8.6230263, 47.334188], [8.6231362, 47.3340444], [8.6229351, 47.3339753], [8.622919, 47.3339953], [8.6226695, 47.3339135]]]}}"
 FeatureCollection,"{'type': 'Feature', 'id': 'way/161147554', 'properties': {'amenity': 'school', 'name': 'Schulhaus Farlifang', 'id': 'way/161147554'}, 'geometry': {'type': 'Polygon', 'coordinates': [[[8.6226051, 47.3348213], [8.6221711, 47.3345741], [8.6220916, 47.3345271], [8.6229914, 47.3332482], [8.6232087, 47.3333045], [8.6233508, 47.3331209], [8.623399, 47.3331352], [8.624125, 47.3333509], [8.6242628, 47.3333918], [8.6239195, 47.3336953], [8.6237926, 47.3338335], [8.6234742, 47.3341771], [8.6231309, 47.3344897], [8.6229619, 47.3346151], [8.6226051, 47.3348213]]]}}"