Change preferred geometry type for various presets (re: c4a469e9a23ffbc19fd6f45a35b65ce0191017c3)

data/presets/presets.json

@@ -98,13 +98,13 @@
     "amenity/clinic/fertility": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["egg", "fertility", "reproductive", "sperm", "ovulation"], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "fertility"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Fertility Clinic"},
     "amenity/clock": {"icon": "temaki-clock", "fields": ["name", "support", "display", "visibility", "date", "faces"], "moreFields": ["covered", "height", "indoor", "level", "lit", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["time"], "tags": {"amenity": "clock"}, "name": "Clock"},
     "amenity/clock/sundial": {"icon": "temaki-clock", "fields": ["name", "support", "visibility", "inscription"], "moreFields": [], "geometry": ["point", "vertex"], "terms": ["gnomon", "shadow"], "tags": {"amenity": "clock", "display": "sundial"}, "reference": {"key": "display", "value": "sundial"}, "name": "Sundial"},
-    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["denomination", "email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "religion", "wheelchair"], "geometry": ["point", "area"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
+    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["denomination", "email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "religion", "wheelchair"], "geometry": ["area", "point"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
     "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
     "amenity/community_centre/lgbtq": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["lgbtq event", "lgbtq hall", "lgbt event", "lgbt hall", "lgb event", "lgb hall"], "tags": {"amenity": "community_centre", "lgbtq": "primary"}, "name": "LGBTQ+ Community Center"},
     "amenity/compressed_air": {"icon": "fas-tachometer-alt", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "covered", "lit"], "moreFields": ["brand", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
     "amenity/conference_centre": {"icon": "fas-user-tie", "fields": ["name", "operator", "building_area", "address", "website", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "conference_centre"}, "terms": ["auditorium", "conference", "exhibition", "exposition", "lecture"], "name": "Convention Center"},
     "amenity/courthouse": {"icon": "fas-gavel", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
-    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "level", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
+    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
     "amenity/dentist": {"icon": "maki-dentist", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
     "amenity/dive_centre": {"icon": "temaki-scuba_diving", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
     "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
@@ -130,30 +130,30 @@
     "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["brand", "building", "email", "fax", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
     "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
     "amenity/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
-    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
+    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
     "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple", "lockable"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
     "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["delivery", "diet_multi", "drive_through", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
     "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
-    "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
+    "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
     "amenity/language_school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
     "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
     "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
     "amenity/loading_dock": {"icon": "fas-truck-loading", "fields": ["ref", "operator", "access_simple", "door", "width", "height"], "moreFields": ["address", "colour", "level", "lit", "wheelchair"], "geometry": ["vertex"], "terms": ["door", "loading bay", "shipping", "unloading", "warehouse"], "tags": {"amenity": "loading_dock"}, "name": "Loading Dock"},
     "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "gnis/feature_id", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
     "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
-    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
+    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
     "amenity/money_transfer": {"icon": "temaki-money_hand", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["money order", "check", "bill", "currency", "finance", "wire transfer", "cable", "person to person", "cash to cash", "exchange"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"},
     "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"},
     "amenity/music_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
     "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
     "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
-    "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
-    "amenity/parking": {"icon": "maki-car", "fields": ["operator", "operator/type", "parking", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
+    "amenity/parking_space": {"fields": ["capacity"], "geometry": ["area", "point", "vertex"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
+    "amenity/parking": {"icon": "maki-car", "fields": ["operator", "operator/type", "parking", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
     "amenity/parking/multi-storey": {"icon": "temaki-car_structure", "fields": ["name", "{amenity/parking}", "building"], "moreFields": ["{amenity/parking}", "height", "levels"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "matchScore": 1.05, "name": "Multilevel Parking Garage"},
-    "amenity/parking/park_ride": {"icon": "temaki-sign_and_car", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "park_ride": "yes"}, "reference": {"key": "park_ride", "value": "yes"}, "terms": ["commuter parking lot", "incentive parking lot", "metro parking lot", "park and pool lot", "park and ride lot", "P+R", "public transport parking lot", "public transit parking lot", "train parking lot"], "name": "Park & Ride Lot"},
-    "amenity/parking/underground": {"icon": "temaki-car_structure", "fields": ["{amenity/parking}", "layer"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "parking": "underground"}, "addTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "reference": {"key": "parking", "value": "underground"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "subsurface parking", "truck parking", "vehicle parking"], "matchScore": 1.05, "name": "Underground Parking"},
+    "amenity/parking/park_ride": {"icon": "temaki-sign_and_car", "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking", "park_ride": "yes"}, "reference": {"key": "park_ride", "value": "yes"}, "terms": ["commuter parking lot", "incentive parking lot", "metro parking lot", "park and pool lot", "park and ride lot", "P+R", "public transport parking lot", "public transit parking lot", "train parking lot"], "name": "Park & Ride Lot"},
+    "amenity/parking/underground": {"icon": "temaki-car_structure", "fields": ["{amenity/parking}", "layer"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking", "parking": "underground"}, "addTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "reference": {"key": "parking", "value": "underground"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "subsurface parking", "truck parking", "vehicle parking"], "matchScore": 1.05, "name": "Underground Parking"},
     "amenity/payment_centre": {"icon": "temaki-money_hand", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
     "amenity/payment_terminal": {"icon": "far-credit-card", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["covered", "currency_multi", "indoor", "level", "wheelchair"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"},
     "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
@@ -177,7 +177,7 @@
     "amenity/post_depot": {"icon": "fas-mail-bulk", "fields": ["name", "operator", "address", "building_area", "phone"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["mail processing and distribution center", "post depot"], "tags": {"amenity": "post_depot"}, "name": "Post Sorting Office"},
     "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
     "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["academic", "ACT", "SAT", "homework", "math", "reading", "test prep", "tutoring", "writing"], "tags": {"amenity": "prep_school"}, "name": "Test Prep / Tutoring School"},
-    "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "operator/type", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
+    "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "operator/type", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
     "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
     "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgbtq pub", "lgbt pub", "lgb pub"], "name": "LGBTQ+ Pub"},
     "amenity/pub/microbrewery": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "microbrewery": "yes"}, "reference": {"key": "microbrewery"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze", "craft brewery", "microbrewery", "small batch brewery"], "name": "Brewpub"},
@@ -209,7 +209,7 @@
     "amenity/restaurant/turkish": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "turkish"}, "reference": {"key": "cuisine", "value": "turkish"}, "name": "Turkish Restaurant"},
     "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"},
     "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
-    "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
+    "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["area", "point"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
     "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["gnis/feature_id", "lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
     "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"},
     "amenity/shelter/lean_to": {"icon": "temaki-sleep_shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"},
@@ -239,7 +239,7 @@
     "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
     "amenity/townhall/city": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["council", "courthouse", "government", "mayor", "municipality"], "tags": {"amenity": "townhall", "townhall:type": "city"}, "name": "City Hall"},
     "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
-    "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
+    "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["area", "point"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
     "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
     "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "ref", "operator", "payment_multi", "currency_multi"], "moreFields": ["blind", "brand", "covered", "height", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
     "amenity/vending_machine/bottle_return": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point", "vertex"], "terms": ["bottle return"], "tags": {"amenity": "vending_machine", "vending": "bottle_return"}, "reference": {"key": "vending", "value": "bottle_return"}, "name": "Bottle Return Machine"},
@@ -269,8 +269,8 @@
     "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "waste", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"},
     "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
     "amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash", "poo", "dog"], "name": "Dog Excrement Bin"},
-    "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["covered", "drinking_water", "lit", "ref"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "RV Drinking Water"},
-    "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
+    "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["covered", "drinking_water", "lit", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "RV Drinking Water"},
+    "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
     "amenity/weighbridge": {"icon": "fas-weight", "fields": ["ref", "operator", "access_simple", "maxweight"], "moreFields": ["address", "colour", "lit", "manufacturer", "material", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["weigh station", "weighbridge"], "tags": {"amenity": "weighbridge"}, "name": "Truck Scale"},
     "area": {"fields": ["name"], "geometry": ["area"], "tags": {"area": "yes"}, "terms": ["polygon"], "name": "Area", "matchScore": 0.1},
     "area/highway": {"fields": ["name", "area/highway", "surface"], "geometry": ["area"], "terms": ["area:highway", "edge of pavement", "highway area", "highway shape", "pavement", "road shape", "street area"], "tags": {"area:highway": "*"}, "name": "Road Area"},
@@ -668,7 +668,7 @@
     "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"},
     "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["area", "point"], "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "website"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
     "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "moreFields": ["level"], "terms": ["al fresco", "beer garden", "dining", "cafe", "restaurant", "pub", "bar", "patio"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"},
-    "leisure/park": {"icon": "temaki-tree_and_bench", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "smoking", "website"], "geometry": ["point", "area"], "terms": ["esplanade", "estate", "forest", "garden", "grass", "green", "grounds", "lawn", "lot", "meadow", "parkland", "place", "playground", "plaza", "pleasure garden", "recreation area", "square", "tract", "village green", "woodland"], "tags": {"leisure": "park"}, "name": "Park"},
+    "leisure/park": {"icon": "temaki-tree_and_bench", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "smoking", "website"], "geometry": ["area", "point"], "terms": ["esplanade", "estate", "forest", "garden", "grass", "green", "grounds", "lawn", "lot", "meadow", "parkland", "place", "playground", "plaza", "pleasure garden", "recreation area", "square", "tract", "village green", "woodland"], "tags": {"leisure": "park"}, "name": "Park"},
     "leisure/picnic_table": {"icon": "maki-picnic-site", "fields": ["material", "lit", "bench"], "moreFields": ["level"], "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"},
     "leisure/picnic_table/chess": {"icon": "fas-chess-pawn", "geometry": ["point"], "tags": {"leisure": "picnic_table", "sport": "chess"}, "reference": {"key": "sport", "value": "chess"}, "terms": ["bench", "chess board", "checkerboard", "checkers", "chequerboard", "game table"], "name": "Chess Table"},
     "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "access_simple", "surface", "lit"], "moreFields": ["charge_fee", "covered", "fee", "gnis/feature_id", "indoor", "payment_multi_fee"], "geometry": ["area", "point"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
@@ -705,7 +705,7 @@
     "leisure/sports_centre/swimming": {"icon": "fas-swimmer", "geometry": ["area", "point"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"},
     "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
     "leisure/swimming_area": {"icon": "fas-swimmer", "fields": ["name", "access_simple", "supervised", "fee", "payment_multi_fee", "charge_fee", "lit"], "moreFields": ["opening_hours", "operator"], "geometry": ["area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"},
-    "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "gnis/feature_id", "opening_hours", "operator"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
+    "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "gnis/feature_id", "opening_hours", "operator"], "geometry": ["area", "point"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
     "leisure/track": {"icon": "iD-other-line", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "moreFields": ["access", "covered", "gnis/feature_id", "indoor", "level"], "geometry": ["line", "point", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"},
     "leisure/track/cycling_point": {"icon": "fas-biking", "fields": ["{leisure/track/cycling}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
     "leisure/track/cycling": {"icon": "fas-biking", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
@@ -758,7 +758,7 @@
     "man_made/pipeline/valve": {"icon": "temaki-wheel", "geometry": ["vertex"], "fields": ["ref", "operator", "valve", "location", "diameter"], "moreFields": ["colour", "manufacturer", "material"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"pipeline": "valve"}, "name": "Pipeline Valve"},
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "moreFields": ["gnis/feature_id"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
     "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
-    "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
+    "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["area", "point"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
     "man_made/storage_tank/water": {"icon": "temaki-storage_tank", "geometry": ["point", "area"], "terms": ["cistern", "water tower"], "tags": {"man_made": "storage_tank", "content": "water"}, "name": "Water Tank"},
     "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "utility_semi", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"},
     "man_made/surveillance": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"},
@@ -775,7 +775,7 @@
     "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "utility_semi", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"},
     "man_made/wastewater_plant": {"icon": "temaki-waste", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
     "man_made/water_tap": {"icon": "maki-drinking-water", "fields": ["ref", "operator", "drinking_water", "access_simple"], "geometry": ["point", "vertex"], "tags": {"man_made": "water_tap"}, "terms": ["drinking water", "water faucet", "water point", "water source", "water spigot"], "name": "Water Tap"},
-    "man_made/water_tower": {"icon": "temaki-water_tower", "fields": ["operator", "height"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
+    "man_made/water_tower": {"icon": "temaki-water_tower", "fields": ["operator", "height"], "moreFields": ["gnis/feature_id"], "geometry": ["area", "point"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
     "man_made/water_well": {"icon": "maki-water", "fields": ["ref", "operator", "drinking_water", "pump", "access_simple"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "terms": ["aquifer", "drinking water", "water point", "water source"], "name": "Water Well"},
     "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"},
     "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
@@ -802,7 +802,7 @@
     "natural/heath": {"geometry": ["area"], "tags": {"natural": "heath"}, "terms": [], "name": "Heath"},
     "natural/mud": {"geometry": ["area"], "tags": {"natural": "mud"}, "terms": ["wetland"], "name": "Mud"},
     "natural/peak": {"icon": "maki-mountain", "fields": ["name", "elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "peak"}, "terms": ["acme", "aiguille", "alp", "climax", "crest", "crown", "hill", "mount", "mountain", "pinnacle", "summit", "tip", "top"], "name": "Peak"},
-    "natural/reef": {"icon": "temaki-beach", "geometry": ["point", "area"], "tags": {"natural": "reef"}, "terms": ["barrier", "coral", "ocean", "sand", "shoal"], "name": "Reef"},
+    "natural/reef": {"icon": "temaki-beach", "geometry": ["area", "point"], "tags": {"natural": "reef"}, "terms": ["barrier", "coral", "ocean", "sand", "shoal"], "name": "Reef"},
     "natural/ridge": {"geometry": ["line"], "tags": {"natural": "ridge"}, "terms": ["crest"], "name": "Ridge"},
     "natural/rock": {"icon": "temaki-boulder2", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "rock"}, "terms": ["boulder", "stone", "rock"], "name": "Attached Rock / Boulder"},
     "natural/saddle": {"icon": "maki-triangle-stroked", "fields": ["elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "saddle"}, "terms": ["pass", "mountain pass", "top"], "name": "Saddle"},
@@ -827,7 +827,7 @@
     "natural/water/stream": {"icon": "iD-waterway-stream", "fields": ["{natural/water}"], "geometry": ["area"], "tags": {"natural": "water", "water": "stream"}, "reference": {"key": "water", "value": "stream"}, "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "name": "Stream Area"},
     "natural/water/wastewater": {"icon": "temaki-waste", "geometry": ["area"], "tags": {"natural": "water", "water": "wastewater"}, "reference": {"key": "water", "value": "wastewater"}, "terms": ["excrement", "shit", "sewage", "wastewater", "Settling Basin", "Clarifier Basin"], "name": "Wastewater Basin"},
     "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland", "salt", "tidal"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "fen", "marsh", "mire", "moor", "muskeg", "peatland", "quagmire", "reedbed", "saltmarsh", "swamp", "tidalflat", "wet meadow"], "name": "Wetland"},
-    "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["boreal", "forest", "forrest", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Natural Wood"},
+    "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["area", "point"], "tags": {"natural": "wood"}, "terms": ["boreal", "forest", "forrest", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Natural Wood"},
     "network/type/node_network": {"fields": ["name", "rwn_ref", "rcn_ref"], "geometry": ["vertex"], "tags": {"network:type": "node_network"}, "terms": ["node network", "rcn", "rwn"], "countryCodes": ["be", "de", "lu", "nl"], "matchScore": 0.2, "name": "Recreational Network Node"},
     "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
     "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
@@ -1272,7 +1272,7 @@
     "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"},
     "waterway/stream_intermittent": {"icon": "iD-waterway-stream", "fields": ["{waterway/stream}"], "moreFields": ["{waterway/stream}"], "geometry": ["line"], "terms": ["arroyo", "beck", "branch", "brook", "burn", "course", "creek", "drift", "flood", "flow", "gully", "run", "runnel", "rush", "spate", "spritz", "tributary", "wadi", "wash", "watercourse"], "tags": {"waterway": "stream", "intermittent": "yes"}, "reference": {"key": "waterway", "value": "stream"}, "name": "Intermittent Stream"},
     "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["covered", "fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"},
-    "waterway/water_point": {"icon": "maki-drinking-water", "fields": ["{amenity/water_point}"], "moreFields": ["{amenity/water_point}"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "Marine Drinking Water"},
+    "waterway/water_point": {"icon": "maki-drinking-water", "fields": ["{amenity/water_point}"], "moreFields": ["{amenity/water_point}"], "geometry": ["point", "vertex", "area"], "tags": {"waterway": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "Marine Drinking Water"},
     "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "moreFields": ["gnis/feature_id"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
     "waterway/weir": {"icon": "maki-dam", "fields": ["name", "operator", "height", "material"], "moreFields": ["gnis/feature_id", "seamark/type"], "geometry": ["vertex", "line"], "terms": ["low-head dam", "low-rise dam", "wier"], "tags": {"waterway": "weir"}, "name": "Weir"},
     "amenity/animal_boarding/PetsHotel": {"name": "PetsHotel", "icon": "maki-veterinary", "imageURL": "https://graph.facebook.com/PetSmart/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q67141961", "amenity": "animal_boarding"}, "addTags": {"amenity": "animal_boarding", "animal_boarding": "dog;cat", "brand": "PetsHotel", "brand:wikidata": "Q67141961", "name": "PetsHotel"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2768,9 +2768,9 @@
     "amenity/fuel/出光": {"name": "出光", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2216770", "amenity": "fuel"}, "addTags": {"amenity": "fuel", "brand": "出光", "brand:en": "Idemitsu Kosan", "brand:ja": "出光", "brand:wikidata": "Q2216770", "brand:wikipedia": "en:Idemitsu Kosan", "name": "出光", "name:en": "Idemitsu Kosan", "name:ja": "出光"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fuel/台灣中油": {"name": "台灣中油", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q21527177", "amenity": "fuel"}, "addTags": {"amenity": "fuel", "brand": "台灣中油", "brand:en": "CPC Corporation, Taiwan", "brand:wikidata": "Q21527177", "brand:wikipedia": "en:CPC Corporation, Taiwan", "brand:zh": "台灣中油", "name": "台灣中油", "name:en": "CPC Corporation, Taiwan", "name:zh": "台灣中油"}, "countryCodes": ["tw"], "terms": ["中油"], "matchScore": 2, "suggestion": true},
     "amenity/fuel/昭和シェル": {"name": "昭和シェル", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q277115", "amenity": "fuel"}, "addTags": {"amenity": "fuel", "brand": "昭和シェル", "brand:en": "Showa Shell Sekiyu", "brand:ja": "昭和シェル", "brand:wikidata": "Q277115", "brand:wikipedia": "en:Showa Shell Sekiyu", "name": "昭和シェル", "name:en": "Showa Shell Sekiyu", "name:ja": "昭和シェル"}, "countryCodes": ["jp"], "terms": ["昭和シェル石油"], "matchScore": 2, "suggestion": true},
-    "amenity/hospital/Select Specialty Hospital": {"name": "Select Specialty Hospital", "icon": "maki-hospital", "imageURL": "https://graph.facebook.com/SelectMedical/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66360902", "amenity": "hospital"}, "addTags": {"amenity": "hospital", "brand": "Select Specialty Hospital", "brand:wikidata": "Q66360902", "healthcare": "hospital", "name": "Select Specialty Hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "countryCodes": ["us"], "terms": ["select speciality"], "matchScore": 2, "suggestion": true},
-    "amenity/hospital/Shriners Hospital for Children": {"name": "Shriners Hospital for Children", "icon": "maki-hospital", "imageURL": "https://graph.facebook.com/ShrinersHospitalsforChildren/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7504109", "amenity": "hospital"}, "addTags": {"amenity": "hospital", "brand": "Shriners Hospitals for Children", "brand:wikidata": "Q7504109", "brand:wikipedia": "en:Shriners Hospitals for Children", "healthcare": "hospital", "healthcare:speciality": "paediatrics", "name": "Shriners Hospitals for Children"}, "reference": {"key": "amenity", "value": "hospital"}, "countryCodes": ["us"], "terms": ["shriners burn hospital", "shriners hospital", "shriners hospitals for children"], "matchScore": 2, "suggestion": true},
-    "amenity/hospital/VA Medical Center": {"name": "VA Medical Center", "icon": "maki-hospital", "imageURL": "https://graph.facebook.com/VeteransHealth/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6580225", "amenity": "hospital"}, "addTags": {"amenity": "hospital", "brand": "VA", "brand:wikidata": "Q6580225", "brand:wikipedia": "en:Veterans Health Administration", "healthcare": "hospital", "healthcare:for": "veterans", "name": "VA Medical Center", "short_name": "VA"}, "reference": {"key": "amenity", "value": "hospital"}, "countryCodes": ["us"], "terms": ["department of veterans affairs medical center", "veterans administration", "veterans administration hospital", "veterans administration medical center", "veterans affairs", "veterans affairs hospital", "veterans affairs medical center"], "matchScore": 2, "suggestion": true},
+    "amenity/hospital/Select Specialty Hospital": {"name": "Select Specialty Hospital", "icon": "maki-hospital", "imageURL": "https://graph.facebook.com/SelectMedical/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q66360902", "amenity": "hospital"}, "addTags": {"amenity": "hospital", "brand": "Select Specialty Hospital", "brand:wikidata": "Q66360902", "healthcare": "hospital", "name": "Select Specialty Hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "countryCodes": ["us"], "terms": ["select speciality"], "matchScore": 2, "suggestion": true},
+    "amenity/hospital/Shriners Hospital for Children": {"name": "Shriners Hospital for Children", "icon": "maki-hospital", "imageURL": "https://graph.facebook.com/ShrinersHospitalsforChildren/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q7504109", "amenity": "hospital"}, "addTags": {"amenity": "hospital", "brand": "Shriners Hospitals for Children", "brand:wikidata": "Q7504109", "brand:wikipedia": "en:Shriners Hospitals for Children", "healthcare": "hospital", "healthcare:speciality": "paediatrics", "name": "Shriners Hospitals for Children"}, "reference": {"key": "amenity", "value": "hospital"}, "countryCodes": ["us"], "terms": ["shriners burn hospital", "shriners hospital", "shriners hospitals for children"], "matchScore": 2, "suggestion": true},
+    "amenity/hospital/VA Medical Center": {"name": "VA Medical Center", "icon": "maki-hospital", "imageURL": "https://graph.facebook.com/VeteransHealth/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q6580225", "amenity": "hospital"}, "addTags": {"amenity": "hospital", "brand": "VA", "brand:wikidata": "Q6580225", "brand:wikipedia": "en:Veterans Health Administration", "healthcare": "hospital", "healthcare:for": "veterans", "name": "VA Medical Center", "short_name": "VA"}, "reference": {"key": "amenity", "value": "hospital"}, "countryCodes": ["us"], "terms": ["department of veterans affairs medical center", "veterans administration", "veterans administration hospital", "veterans administration medical center", "veterans affairs", "veterans affairs hospital", "veterans affairs medical center"], "matchScore": 2, "suggestion": true},
     "amenity/ice_cream/Abbott's Frozen Custard": {"name": "Abbott's Frozen Custard", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/AbbottsFrozenCustard/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4664334", "amenity": "ice_cream"}, "addTags": {"amenity": "ice_cream", "brand": "Abbott's Frozen Custard", "brand:wikidata": "Q4664334", "brand:wikipedia": "en:Abbott's Frozen Custard", "name": "Abbott's Frozen Custard", "short_name": "Abbott's"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/ice_cream/Amorino": {"name": "Amorino", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/AmorinoGelato/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2843884", "amenity": "ice_cream"}, "addTags": {"amenity": "ice_cream", "brand": "Amorino", "brand:wikidata": "Q2843884", "brand:wikipedia": "fr:Amorino", "name": "Amorino"}, "countryCodes": ["ae", "ch", "cz", "de", "es", "fr", "gr", "ie", "it", "lu", "ma", "mt", "mx", "nc", "pt", "qa", "re", "uk", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/ice_cream/Amy's Ice Creams": {"name": "Amy's Ice Creams", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/amysicecreams/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4749045", "amenity": "ice_cream"}, "addTags": {"amenity": "ice_cream", "brand": "Amy's Ice Creams", "brand:wikidata": "Q4749045", "brand:wikipedia": "en:Amy's Ice Creams", "name": "Amy's Ice Creams"}, "terms": [], "matchScore": 2, "suggestion": true},
@@ -2799,15 +2799,15 @@
     "amenity/ice_cream/Yogurtland": {"name": "Yogurtland", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/yogurtland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8054428", "amenity": "ice_cream"}, "addTags": {"amenity": "ice_cream", "brand": "Yogurtland", "brand:wikidata": "Q8054428", "brand:wikipedia": "en:Yogurtland", "cuisine": "frozen_yogurt", "name": "Yogurtland", "takeaway": "yes"}, "countryCodes": ["ae", "au", "sg", "th", "us", "ve"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/ice_cream/sweetFrog": {"name": "sweetFrog", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/sweetfrogfroyo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16952110", "amenity": "ice_cream"}, "addTags": {"amenity": "ice_cream", "brand": "sweetFrog", "brand:wikidata": "Q16952110", "brand:wikipedia": "en:Sweet Frog", "cuisine": "frozen_yogurt", "name": "sweetFrog"}, "countryCodes": ["us"], "terms": ["sweetfrog frozen yogurt", "sweetfrog premium frozen yogurt"], "matchScore": 2, "suggestion": true},
     "amenity/ice_cream/サーティワンアイスクリーム": {"name": "サーティワンアイスクリーム", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/baskinrobbinsUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q584601", "amenity": "ice_cream"}, "addTags": {"amenity": "ice_cream", "brand": "バスキン・ロビンス", "brand:en": "Baskin-Robbins", "brand:ja": "バスキン・ロビンス", "brand:wikidata": "Q584601", "brand:wikipedia": "ja:バスキン・ロビンス", "cuisine": "ice_cream", "name": "サーティワンアイスクリーム", "name:en": "Baskin-Robbins", "name:ja": "サーティワンアイスクリーム"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/Children's Learning Adventure": {"name": "Children's Learning Adventure", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/Childrenslearningadventure/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64821213", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "amenity": "kindergarten", "brand": "Children's Learning Adventure", "brand:wikidata": "Q64821213", "brand:wikipedia": "en:Children's Learning Adventure", "fee": "yes", "isced:level": "0", "name": "Children's Learning Adventure", "nursery": "yes", "preschool": "yes", "short_name": "CLA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/Childtime": {"name": "Childtime", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/Childtime/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877793", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "Childtime", "brand:wikidata": "Q64877793", "fee": "yes", "isced:level": "0", "name": "Childtime", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["childtime learning center", "childtime learning centers"], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/KinderCare": {"name": "KinderCare", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/kindercare/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6410551", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "KinderCare Learning Center", "amenity": "kindergarten", "brand": "KinderCare", "brand:wikidata": "Q6410551", "brand:wikipedia": "en:KinderCare Learning Centers", "fee": "yes", "isced:level": "0", "name": "KinderCare", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/La Petite Academy": {"name": "La Petite Academy", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/LaPetiteAcademy/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877784", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "La Petite Academy", "brand:wikidata": "Q64877784", "fee": "yes", "isced:level": "0", "name": "La Petite Academy", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["la petite"], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/New Horizon Academy": {"name": "New Horizon Academy", "icon": "temaki-school", "imageURL": "https://pbs.twimg.com/profile_images/778681004206592001/ZQF3Eurh_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64821306", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "amenity": "kindergarten", "brand": "New Horizon Academy", "brand:wikidata": "Q64821306", "fee": "yes", "isced:level": "0", "name": "New Horizon Academy", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/Primrose School": {"name": "Primrose School", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/PrimroseSchools/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7243677", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "Primrose Schools", "amenity": "kindergarten", "brand": "Primrose School", "brand:wikidata": "Q7243677", "brand:wikipedia": "en:Primrose Schools", "fee": "yes", "isced:level": "0", "max_age": "12", "min_age": "6 weeks", "name": "Primrose School", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["primrose"], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/The Children's Courtyard": {"name": "The Children's Courtyard", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/ChildrensCourtyard/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877852", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "The Children's Courtyard", "brand:wikidata": "Q64877852", "fee": "yes", "isced:level": "0", "name": "The Children's Courtyard", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["children's courtyard"], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/The Goddard School": {"name": "The Goddard School", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/goddardschool/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5576260", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "Goddard School", "amenity": "kindergarten", "brand": "The Goddard School", "brand:wikidata": "Q5576260", "brand:wikipedia": "en:Goddard School", "fee": "yes", "isced:level": "0", "min_age": "6 weeks", "name": "The Goddard School", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/Tutor Time": {"name": "Tutor Time", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/TutorTime/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877826", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "Tutor Time", "brand:wikidata": "Q64877826", "fee": "yes", "isced:level": "0", "name": "Tutor Time", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["tutor time child care", "tutor time child care learning center", "tutor time learning center", "tutor time learning centers"], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/Children's Learning Adventure": {"name": "Children's Learning Adventure", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/Childrenslearningadventure/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q64821213", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "amenity": "kindergarten", "brand": "Children's Learning Adventure", "brand:wikidata": "Q64821213", "brand:wikipedia": "en:Children's Learning Adventure", "fee": "yes", "isced:level": "0", "name": "Children's Learning Adventure", "nursery": "yes", "preschool": "yes", "short_name": "CLA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/Childtime": {"name": "Childtime", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/Childtime/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q64877793", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "Childtime", "brand:wikidata": "Q64877793", "fee": "yes", "isced:level": "0", "name": "Childtime", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["childtime learning center", "childtime learning centers"], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/KinderCare": {"name": "KinderCare", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/kindercare/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q6410551", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "KinderCare Learning Center", "amenity": "kindergarten", "brand": "KinderCare", "brand:wikidata": "Q6410551", "brand:wikipedia": "en:KinderCare Learning Centers", "fee": "yes", "isced:level": "0", "name": "KinderCare", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/La Petite Academy": {"name": "La Petite Academy", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/LaPetiteAcademy/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q64877784", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "La Petite Academy", "brand:wikidata": "Q64877784", "fee": "yes", "isced:level": "0", "name": "La Petite Academy", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["la petite"], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/New Horizon Academy": {"name": "New Horizon Academy", "icon": "temaki-school", "imageURL": "https://pbs.twimg.com/profile_images/778681004206592001/ZQF3Eurh_bigger.jpg", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q64821306", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "amenity": "kindergarten", "brand": "New Horizon Academy", "brand:wikidata": "Q64821306", "fee": "yes", "isced:level": "0", "name": "New Horizon Academy", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/Primrose School": {"name": "Primrose School", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/PrimroseSchools/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q7243677", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "Primrose Schools", "amenity": "kindergarten", "brand": "Primrose School", "brand:wikidata": "Q7243677", "brand:wikipedia": "en:Primrose Schools", "fee": "yes", "isced:level": "0", "max_age": "12", "min_age": "6 weeks", "name": "Primrose School", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["primrose"], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/The Children's Courtyard": {"name": "The Children's Courtyard", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/ChildrensCourtyard/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q64877852", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "The Children's Courtyard", "brand:wikidata": "Q64877852", "fee": "yes", "isced:level": "0", "name": "The Children's Courtyard", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["children's courtyard"], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/The Goddard School": {"name": "The Goddard School", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/goddardschool/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q5576260", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "Goddard School", "amenity": "kindergarten", "brand": "The Goddard School", "brand:wikidata": "Q5576260", "brand:wikipedia": "en:Goddard School", "fee": "yes", "isced:level": "0", "min_age": "6 weeks", "name": "The Goddard School", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/Tutor Time": {"name": "Tutor Time", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/TutorTime/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q64877826", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "Tutor Time", "brand:wikidata": "Q64877826", "fee": "yes", "isced:level": "0", "name": "Tutor Time", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["tutor time child care", "tutor time child care learning center", "tutor time learning center", "tutor time learning centers"], "matchScore": 2, "suggestion": true},
     "amenity/language_school/AEON": {"name": "AEON", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/AEONCorporation/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4687898", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "AEON", "brand:en": "Aeon", "brand:ja": "AEON", "brand:ja-Hira": "イーオン", "brand:ja-Latn": "AEON", "brand:wikidata": "Q4687898", "brand:wikipedia": "ja:イーオン", "language:en": "main", "name": "AEON", "name:en": "Aeon", "name:ja": "AEON", "name:ja-Hira": "イーオン", "name:ja-Latn": "AEON"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/language_school/Berlitz": {"name": "Berlitz", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/BerlitzUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q821960", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "Berlitz", "brand:wikidata": "Q821960", "brand:wikipedia": "en:Berlitz Corporation", "name": "Berlitz"}, "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/language_school/ECC外語学院": {"name": "ECC外語学院", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/ecc.co.jp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5322655", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "ECC外語学院", "brand:en": "ECC Foreign Language Institute", "brand:ja": "ECC外語学院", "brand:ja-Hira": "イーシーシーがいごがくいん", "brand:ja-Latn": "ECC Gaigo Gakuin", "brand:wikidata": "Q5322655", "brand:wikipedia": "ja:ECC総合教育機関", "language:en": "main", "name": "ECC外語学院", "name:en": "ECC Foreign Language Institute", "name:ja": "ECC外語学院", "name:ja-Hira": "イーシーシーがいごがくいん", "name:ja-Latn": "ECC Gaigo Gakuin", "short_name": "ECC", "short_name:en": "ECC", "short_name:ja": "ECC", "short_name:ja-Hira": "イーシーシー", "short_name:ja-Latn": "ECC"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2824,10 +2824,10 @@
     "amenity/money_transfer/MoneyGram": {"name": "MoneyGram", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/moneygram/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1944412", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "MoneyGram", "brand:wikidata": "Q1944412", "brand:wikipedia": "en:MoneyGram", "name": "MoneyGram"}, "countryCodes": ["de", "fr", "gr"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/money_transfer/Orange Money": {"name": "Orange Money", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/orange/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16668220", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Orange Money", "brand:wikidata": "Q16668220", "brand:wikipedia": "en:Orange Money", "name": "Orange Money"}, "countryCodes": ["ml"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/money_transfer/Western Union": {"name": "Western Union", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/WesternUnion/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q861042", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Western Union", "brand:wikidata": "Q861042", "brand:wikipedia": "en:Western Union", "name": "Western Union"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/parking/Diamond Parking": {"name": "Diamond Parking", "icon": "maki-car", "imageURL": "https://graph.facebook.com/DiamondParkingService/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q5270887", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Diamond Parking", "brand:wikidata": "Q5270887", "brand:wikipedia": "en:Diamond Parking", "name": "Diamond Parking"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/parking/Parking Company of America": {"name": "Parking Company of America", "icon": "maki-car", "imageURL": "https://graph.facebook.com/parkingcompanyofamerica/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q65491376", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Parking Company of America", "brand:wikidata": "Q65491376", "fee": "yes", "name": "Parking Company of America", "short_name": "PCA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/parking/SP+": {"name": "SP+", "icon": "maki-car", "imageURL": "https://graph.facebook.com/sppluscorp/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q7598289", "amenity": "parking"}, "addTags": {"alt_name": "SP Plus", "amenity": "parking", "brand": "SP+", "brand:wikidata": "Q7598289", "brand:wikipedia": "en:SP Plus Corporation", "fee": "yes", "name": "SP+"}, "countryCodes": ["ca", "us"], "terms": ["central parking", "central parking system", "standard parking"], "matchScore": 2, "suggestion": true},
-    "amenity/parking/Wilson Parking": {"name": "Wilson Parking", "icon": "maki-car", "imageURL": "https://graph.facebook.com/wilsonstorage.hk/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q28448427", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Wilson Parking", "brand:wikidata": "Q28448427", "brand:wikipedia": "en:Wilson Parking", "fee": "yes", "name": "Wilson Parking"}, "countryCodes": ["au", "cn", "hk", "ko", "nz", "sg"], "terms": ["wilson"], "matchScore": 2, "suggestion": true},
+    "amenity/parking/Diamond Parking": {"name": "Diamond Parking", "icon": "maki-car", "imageURL": "https://graph.facebook.com/DiamondParkingService/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q5270887", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Diamond Parking", "brand:wikidata": "Q5270887", "brand:wikipedia": "en:Diamond Parking", "name": "Diamond Parking"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/parking/Parking Company of America": {"name": "Parking Company of America", "icon": "maki-car", "imageURL": "https://graph.facebook.com/parkingcompanyofamerica/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q65491376", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Parking Company of America", "brand:wikidata": "Q65491376", "fee": "yes", "name": "Parking Company of America", "short_name": "PCA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/parking/SP+": {"name": "SP+", "icon": "maki-car", "imageURL": "https://graph.facebook.com/sppluscorp/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q7598289", "amenity": "parking"}, "addTags": {"alt_name": "SP Plus", "amenity": "parking", "brand": "SP+", "brand:wikidata": "Q7598289", "brand:wikipedia": "en:SP Plus Corporation", "fee": "yes", "name": "SP+"}, "countryCodes": ["ca", "us"], "terms": ["central parking", "central parking system", "standard parking"], "matchScore": 2, "suggestion": true},
+    "amenity/parking/Wilson Parking": {"name": "Wilson Parking", "icon": "maki-car", "imageURL": "https://graph.facebook.com/wilsonstorage.hk/picture?type=large", "geometry": ["area", "point", "vertex"], "tags": {"brand:wikidata": "Q28448427", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Wilson Parking", "brand:wikidata": "Q28448427", "brand:wikipedia": "en:Wilson Parking", "fee": "yes", "name": "Wilson Parking"}, "countryCodes": ["au", "cn", "hk", "ko", "nz", "sg"], "terms": ["wilson"], "matchScore": 2, "suggestion": true},
     "amenity/payment_centre/Abitab": {"name": "Abitab", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/Abitaboficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16488129", "amenity": "payment_centre"}, "addTags": {"amenity": "payment_centre", "brand": "Abitab", "brand:wikidata": "Q16488129", "brand:wikipedia": "es:Abitab", "name": "Abitab"}, "countryCodes": ["uy"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/payment_centre/Rapipago": {"name": "Rapipago", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/Rapipago/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6100413", "amenity": "payment_centre"}, "addTags": {"amenity": "payment_centre", "brand": "Rapipago", "brand:wikidata": "Q6100413", "brand:wikipedia": "es:Rapipago", "name": "Rapipago"}, "countryCodes": ["ar"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/payment_terminal/Qiwi": {"name": "Qiwi", "icon": "far-credit-card", "imageURL": "https://graph.facebook.com/qiwirussia/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q4047736", "amenity": "payment_terminal"}, "addTags": {"amenity": "payment_terminal", "brand": "Qiwi", "brand:wikidata": "Q4047736", "brand:wikipedia": "en:Qiwi", "name": "Qiwi"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -3262,9 +3262,9 @@
     "amenity/restaurant/japanese/華屋与兵衛": {"name": "華屋与兵衛", "icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11620063", "amenity": "restaurant", "cuisine": "japanese"}, "addTags": {"amenity": "restaurant", "brand": "華屋与兵衛", "brand:en": "Hanaya Yohei", "brand:ja": "華屋与兵衛", "brand:wikidata": "Q11620063", "brand:wikipedia": "ja:華屋与兵衛 (レストラン)", "cuisine": "japanese", "name": "華屋与兵衛", "name:en": "Hanaya Yohei", "name:ja": "華屋与兵衛"}, "reference": {"key": "cuisine", "value": "japanese"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/chinese/餃子の王将": {"name": "餃子の王将", "icon": "maki-restaurant-noodle", "imageURL": "https://graph.facebook.com/ohshosaiyo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11666805", "amenity": "restaurant", "cuisine": "chinese;gyoza"}, "addTags": {"amenity": "restaurant", "brand": "餃子の王将", "brand:en": "Gyoza no Ohsho", "brand:ja": "餃子の王将", "brand:wikidata": "Q11666805", "brand:wikipedia": "en:Gyoza no Ohsho", "cuisine": "chinese;gyoza", "name": "餃子の王将", "name:en": "Gyoza no Ohsho", "name:ja": "餃子の王将"}, "reference": {"key": "cuisine", "value": "chinese"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/빕스": {"name": "빕스", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/ivips/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12599540", "amenity": "restaurant"}, "addTags": {"amenity": "restaurant", "brand": "빕스", "brand:en": "Vips", "brand:ko": "빕스", "brand:wikidata": "Q12599540", "brand:wikipedia": "ko:빕스", "cuisine": "salad;steak_house", "name": "빕스", "name:en": "Vips", "name:ko": "빕스"}, "countryCodes": ["kr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/school/Imagine Schools": {"name": "Imagine Schools", "icon": "temaki-school", "imageURL": "https://pbs.twimg.com/profile_images/378800000441414844/d5dd1489ee04654b0efb3f99873bea51_bigger.jpeg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6002737", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "Imagine Schools", "brand:wikidata": "Q6002737", "brand:wikipedia": "en:Imagine Schools", "name": "Imagine Schools", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": ["imagine", "imagine school"], "matchScore": 2, "suggestion": true},
-    "amenity/school/KIPP": {"name": "KIPP", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/KIPPFoundation/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6423304", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "KIPP", "brand:wikidata": "Q6423304", "brand:wikipedia": "en:KIPP (organization)", "name": "KIPP", "official_name": "Knowledge Is Power Program", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/school/Success Academy": {"name": "Success Academy", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/SuccessAcademies/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q14707388", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "Success Academy", "brand:wikidata": "Q14707388", "brand:wikipedia": "en:Success Academy Charter Schools", "name": "Success Academy", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/school/Imagine Schools": {"name": "Imagine Schools", "icon": "temaki-school", "imageURL": "https://pbs.twimg.com/profile_images/378800000441414844/d5dd1489ee04654b0efb3f99873bea51_bigger.jpeg", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q6002737", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "Imagine Schools", "brand:wikidata": "Q6002737", "brand:wikipedia": "en:Imagine Schools", "name": "Imagine Schools", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": ["imagine", "imagine school"], "matchScore": 2, "suggestion": true},
+    "amenity/school/KIPP": {"name": "KIPP", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/KIPPFoundation/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q6423304", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "KIPP", "brand:wikidata": "Q6423304", "brand:wikipedia": "en:KIPP (organization)", "name": "KIPP", "official_name": "Knowledge Is Power Program", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/school/Success Academy": {"name": "Success Academy", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/SuccessAcademies/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q14707388", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "Success Academy", "brand:wikidata": "Q14707388", "brand:wikipedia": "en:Success Academy Charter Schools", "name": "Success Academy", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/social_centre/American Legion Hall": {"name": "American Legion Hall", "icon": "fas-handshake", "imageURL": "https://graph.facebook.com/americanlegionhq/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q468865", "amenity": "social_centre"}, "addTags": {"amenity": "social_centre", "brand": "American Legion", "brand:wikidata": "Q468865", "brand:wikipedia": "en:American Legion", "name": "American Legion Hall", "social_centre:for": "veterans"}, "countryCodes": ["us"], "terms": ["american legion"], "matchScore": 2, "suggestion": true},
     "amenity/social_centre/Eagles Lodge": {"name": "Eagles Lodge", "icon": "fas-handshake", "imageURL": "https://graph.facebook.com/foegrandaerie/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5493810", "amenity": "social_centre"}, "addTags": {"alt_name": "Aeries Lodge", "amenity": "social_centre", "brand": "Fraternal Order of Eagles", "brand:wikidata": "Q5493810", "brand:wikipedia": "en:Fraternal Order of Eagles", "name": "Eagles Lodge", "official_name": "Fraternal Order of Eagles", "short_name": "FOE"}, "countryCodes": ["us"], "terms": ["aeries", "eagles"], "matchScore": 2, "suggestion": true},
     "amenity/social_centre/Elks Lodge": {"name": "Elks Lodge", "icon": "fas-handshake", "imageURL": "https://graph.facebook.com/bpoeusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2895789", "amenity": "social_centre"}, "addTags": {"amenity": "social_centre", "brand": "Benevolent and Protective Order of Elks", "brand:wikidata": "Q2895789", "brand:wikipedia": "en:Benevolent and Protective Order of Elks", "name": "Elks Lodge", "official_name": "Benevolent and Protective Order of Elks", "short_name": "BPOE"}, "countryCodes": ["us"], "terms": ["elks"], "matchScore": 2, "suggestion": true},
@@ -3275,9 +3275,9 @@
     "amenity/social_centre/Royal Canadian Legion Hall": {"name": "Royal Canadian Legion Hall", "icon": "fas-handshake", "imageURL": "https://graph.facebook.com/CanadianLegion/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3270231", "amenity": "social_centre"}, "addTags": {"amenity": "social_centre", "brand": "Royal Canadian Legion", "brand:wikidata": "Q3270231", "brand:wikipedia": "en:Royal Canadian Legion", "name": "Royal Canadian Legion Hall", "short_name": "RCL"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/social_centre/VFW Post": {"name": "VFW Post", "icon": "fas-handshake", "imageURL": "https://graph.facebook.com/VFWFans/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3556413", "amenity": "social_centre"}, "addTags": {"amenity": "social_centre", "brand": "Veterans of Foreign Wars of the United States", "brand:wikidata": "Q3556413", "brand:wikipedia": "en:Veterans of Foreign Wars", "name": "VFW Post", "name:en": "VFW Post", "official_name": "Veterans of Foreign Wars of the United States", "short_name": "VFW", "social_centre:for": "veterans"}, "countryCodes": ["de", "jp", "kr", "ph", "th", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/social_facility/Vet Center": {"name": "Vet Center", "icon": "temaki-social_facility", "imageURL": "https://graph.facebook.com/VeteransHealth/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6580225", "amenity": "social_facility"}, "addTags": {"amenity": "social_facility", "brand": "VA", "brand:wikidata": "Q6580225", "brand:wikipedia": "en:Veterans Health Administration", "healthcare": "counselling", "healthcare:counselling": "psychiatry", "healthcare:for": "veterans", "name": "Vet Center", "social_facility": "healthcare;outreach", "social_facility:for": "veterans"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/university/DeVry University": {"name": "DeVry University", "icon": "maki-college", "imageURL": "https://graph.facebook.com/DEVRYUNIVERSITY/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3298441", "amenity": "university"}, "addTags": {"amenity": "university", "brand": "DeVry University", "brand:wikidata": "Q3298441", "brand:wikipedia": "en:DeVry University", "name": "DeVry University", "short_name": "DeVry"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/university/Strayer University": {"name": "Strayer University", "icon": "maki-college", "imageURL": "https://graph.facebook.com/StrayerUniversity/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7622587", "amenity": "university"}, "addTags": {"amenity": "university", "brand": "Strayer University", "brand:wikidata": "Q7622587", "brand:wikipedia": "en:Strayer University", "name": "Strayer University", "short_name": "Strayer"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/university/University of Phoenix": {"name": "University of Phoenix", "icon": "maki-college", "imageURL": "https://graph.facebook.com/universityofphoenix/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1889100", "amenity": "university"}, "addTags": {"amenity": "university", "brand": "University of Phoenix", "brand:wikidata": "Q1889100", "brand:wikipedia": "en:University of Phoenix", "name": "University of Phoenix", "short_name": "UOPX"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/university/DeVry University": {"name": "DeVry University", "icon": "maki-college", "imageURL": "https://graph.facebook.com/DEVRYUNIVERSITY/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q3298441", "amenity": "university"}, "addTags": {"amenity": "university", "brand": "DeVry University", "brand:wikidata": "Q3298441", "brand:wikipedia": "en:DeVry University", "name": "DeVry University", "short_name": "DeVry"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/university/Strayer University": {"name": "Strayer University", "icon": "maki-college", "imageURL": "https://graph.facebook.com/StrayerUniversity/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q7622587", "amenity": "university"}, "addTags": {"amenity": "university", "brand": "Strayer University", "brand:wikidata": "Q7622587", "brand:wikipedia": "en:Strayer University", "name": "Strayer University", "short_name": "Strayer"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/university/University of Phoenix": {"name": "University of Phoenix", "icon": "maki-college", "imageURL": "https://graph.facebook.com/universityofphoenix/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q1889100", "amenity": "university"}, "addTags": {"amenity": "university", "brand": "University of Phoenix", "brand:wikidata": "Q1889100", "brand:wikipedia": "en:University of Phoenix", "name": "University of Phoenix", "short_name": "UOPX"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vehicle_inspection/Autosur": {"name": "Autosur", "icon": "maki-car", "imageURL": "https://graph.facebook.com/autosurfrance/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64224807", "amenity": "vehicle_inspection"}, "addTags": {"amenity": "vehicle_inspection", "brand": "Autosur", "brand:wikidata": "Q64224807", "name": "Autosur"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vehicle_inspection/Autovision": {"name": "Autovision", "icon": "maki-car", "imageURL": "https://graph.facebook.com/AutovisionFrance/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64224842", "amenity": "vehicle_inspection"}, "addTags": {"amenity": "vehicle_inspection", "brand": "Autovision", "brand:wikidata": "Q64224842", "name": "Autovision"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vehicle_inspection/Dekra": {"name": "Dekra", "icon": "maki-car", "imageURL": "https://pbs.twimg.com/profile_images/3238634623/8ccb79c10c4bfb652432961fe776c6c3_bigger.jpeg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q383711", "amenity": "vehicle_inspection"}, "addTags": {"amenity": "vehicle_inspection", "brand": "Dekra", "brand:wikidata": "Q383711", "brand:wikipedia": "en:Dekra", "name": "Dekra", "official_name": "Dekra Automotive"}, "countryCodes": ["de", "fr"], "terms": [], "matchScore": 2, "suggestion": true},

data/presets/presets/amenity/college.json

@@ -20,8 +20,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "university",

data/presets/presets/amenity/crematorium.json

@@ -18,8 +18,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "area",
-        "point"
+        "point",
+        "area"
     ],
     "tags": {
         "amenity": "crematorium"

data/presets/presets/amenity/hospital.json

@@ -20,8 +20,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "clinic",

data/presets/presets/amenity/kindergarten.json

@@ -20,8 +20,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "kindergarden",

data/presets/presets/amenity/monastery.json

@@ -16,8 +16,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "abbey",

data/presets/presets/amenity/parking.json

@@ -27,9 +27,9 @@
         "wheelchair"
     ],
     "geometry": [
+        "area",
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "tags": {
         "amenity": "parking"

data/presets/presets/amenity/parking/park_ride.json

@@ -1,9 +1,9 @@
 {
     "icon": "temaki-sign_and_car",
     "geometry": [
+        "area",
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "tags": {
         "amenity": "parking",

data/presets/presets/amenity/parking/underground.json

@@ -5,9 +5,9 @@
         "layer"
     ],
     "geometry": [
+        "area",
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "tags": {
         "amenity": "parking",

data/presets/presets/amenity/parking_space.json

@@ -3,9 +3,9 @@
         "capacity"
     ],
     "geometry": [
+        "area",
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "terms": [],
     "tags": {

data/presets/presets/amenity/prison.json

@@ -15,8 +15,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "cell",

data/presets/presets/amenity/school.json

@@ -23,8 +23,8 @@
         "wheelchair"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "academy",

data/presets/presets/amenity/university.json

@@ -7,8 +7,8 @@
         "{amenity/college}"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "college",

data/presets/presets/amenity/water_point.json

@@ -15,9 +15,9 @@
         "ref"
     ],
     "geometry": [
-        "area",
+        "point",
         "vertex",
-        "point"
+        "area"
     ],
     "tags": {
         "amenity": "water_point"

data/presets/presets/amenity/watering_place.json

@@ -8,9 +8,9 @@
         "opening_hours"
     ],
     "geometry": [
-        "area",
+        "point",
         "vertex",
-        "point"
+        "area"
     ],
     "tags": {
         "amenity": "watering_place"

data/presets/presets/leisure/park.json

@@ -16,8 +16,8 @@
         "website"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "esplanade",

data/presets/presets/leisure/swimming_pool.json

@@ -16,8 +16,8 @@
         "operator"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "dive",

data/presets/presets/man_made/storage_tank.json

@@ -14,8 +14,8 @@
         "manufacturer"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "terms": [
         "water",

data/presets/presets/man_made/water_tower.json

@@ -8,8 +8,8 @@
         "gnis/feature_id"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "man_made": "water_tower"

data/presets/presets/natural/reef.json

@@ -1,8 +1,8 @@
 {
     "icon": "temaki-beach",
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "natural": "reef"

data/presets/presets/natural/wood.json

@@ -6,8 +6,8 @@
         "leaf_cycle"
     ],
     "geometry": [
-        "point",
-        "area"
+        "area",
+        "point"
     ],
     "tags": {
         "natural": "wood"

data/presets/presets/waterway/water_point.json

@@ -7,9 +7,9 @@
         "{amenity/water_point}"
     ],
     "geometry": [
-        "area",
+        "point",
         "vertex",
-        "point"
+        "area"
     ],
     "tags": {
         "waterway": "water_point"

data/taginfo.json

@@ -101,12 +101,12 @@
     {"key": "healthcare:speciality", "value": "fertility", "description": "🄿 Fertility Clinic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "amenity", "value": "clock", "description": "🄿 Clock", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/clock.svg"},
     {"key": "display", "value": "sundial", "description": "🄿 Sundial", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/clock.svg"},
-    {"key": "amenity", "value": "college", "description": "🄿 College Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/college-15.svg"},
+    {"key": "amenity", "value": "college", "description": "🄿 College Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/college-15.svg"},
     {"key": "amenity", "value": "community_centre", "description": "🄿 Community Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
     {"key": "amenity", "value": "compressed_air", "description": "🄿 Compressed Air", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tachometer-alt.svg"},
     {"key": "amenity", "value": "conference_centre", "description": "🄿 Convention Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-user-tie.svg"},
     {"key": "amenity", "value": "courthouse", "description": "🄿 Courthouse", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-gavel.svg"},
-    {"key": "amenity", "value": "crematorium", "description": "🄿 Crematorium", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"},
+    {"key": "amenity", "value": "crematorium", "description": "🄿 Crematorium", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"},
     {"key": "amenity", "value": "dentist", "description": "🄿 Dentist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dentist-15.svg"},
     {"key": "amenity", "value": "dive_centre", "description": "🄿 Dive Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/scuba_diving.svg"},
     {"key": "amenity", "value": "doctors", "description": "🄿 Doctor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/doctor-15.svg"},
@@ -132,29 +132,29 @@
     {"key": "amenity", "value": "fuel", "description": "🄿 Gas Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fuel-15.svg"},
     {"key": "amenity", "value": "grave_yard", "description": "🄿 Graveyard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"},
     {"key": "amenity", "value": "grit_bin", "description": "🄿 Grit Bin", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-box.svg"},
-    {"key": "amenity", "value": "hospital", "description": "🄿 Hospital Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
+    {"key": "amenity", "value": "hospital", "description": "🄿 Hospital Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "amenity", "value": "hunting_stand", "description": "🄿 Hunting Stand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/binoculars.svg"},
     {"key": "amenity", "value": "ice_cream", "description": "🄿 Ice Cream Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-ice-cream.svg"},
     {"key": "amenity", "value": "internet_cafe", "description": "🄿 Internet Cafe", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/antenna.svg"},
     {"key": "amenity", "value": "karaoke_box", "description": "🄿 Karaoke Box", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/karaoke-15.svg"},
-    {"key": "amenity", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/school.svg"},
+    {"key": "amenity", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/school.svg"},
     {"key": "amenity", "value": "language_school", "description": "🄿 Language School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/school.svg"},
     {"key": "amenity", "value": "letter_box", "description": "🄿 Letter Box", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/letter_box.svg"},
     {"key": "amenity", "value": "library", "description": "🄿 Library", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/library-15.svg"},
     {"key": "amenity", "value": "loading_dock", "description": "🄿 Loading Dock", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-truck-loading.svg"},
     {"key": "amenity", "value": "love_hotel", "description": "🄿 Love Hotel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/heart-15.svg"},
     {"key": "amenity", "value": "marketplace", "description": "🄿 Marketplace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "amenity", "value": "monastery", "description": "🄿 Monastery Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
+    {"key": "amenity", "value": "monastery", "description": "🄿 Monastery Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
     {"key": "amenity", "value": "money_transfer", "description": "🄿 Money Transfer Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/money_hand.svg"},
     {"key": "amenity", "value": "motorcycle_parking", "description": "🄿 Motorcycle Parking", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-motorcycle.svg"},
     {"key": "amenity", "value": "music_school", "description": "🄿 Music School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-music.svg"},
     {"key": "amenity", "value": "nightclub", "description": "🄿 Nightclub", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bar-15.svg"},
     {"key": "amenity", "value": "parking_entrance", "description": "🄿 Parking Garage Entrance/Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
-    {"key": "amenity", "value": "parking_space", "description": "🄿 Parking Space", "object_types": ["node", "area"]},
-    {"key": "amenity", "value": "parking", "description": "🄿 Parking Lot", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
+    {"key": "amenity", "value": "parking_space", "description": "🄿 Parking Space", "object_types": ["area", "node"]},
+    {"key": "amenity", "value": "parking", "description": "🄿 Parking Lot", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "parking", "value": "multi-storey", "description": "🄿 Multilevel Parking Garage, 🄵 Type", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_structure.svg"},
-    {"key": "park_ride", "value": "yes", "description": "🄿 Park & Ride Lot", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sign_and_car.svg"},
-    {"key": "parking", "value": "underground", "description": "🄿 Underground Parking, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_structure.svg"},
+    {"key": "park_ride", "value": "yes", "description": "🄿 Park & Ride Lot", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sign_and_car.svg"},
+    {"key": "parking", "value": "underground", "description": "🄿 Underground Parking, 🄵 Type", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_structure.svg"},
     {"key": "amenity", "value": "payment_centre", "description": "🄿 Payment Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/money_hand.svg"},
     {"key": "amenity", "value": "payment_terminal", "description": "🄿 Payment Terminal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/far-credit-card.svg"},
     {"key": "amenity", "value": "pharmacy", "description": "🄿 Pharmacy Counter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pharmacy-15.svg"},
@@ -178,7 +178,7 @@
     {"key": "amenity", "value": "post_depot", "description": "🄿 Post Sorting Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-mail-bulk.svg"},
     {"key": "amenity", "value": "post_office", "description": "🄿 Post Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/post-15.svg"},
     {"key": "amenity", "value": "prep_school", "description": "🄿 Test Prep / Tutoring School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/school.svg"},
-    {"key": "amenity", "value": "prison", "description": "🄿 Prison Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/prison-15.svg"},
+    {"key": "amenity", "value": "prison", "description": "🄿 Prison Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/prison-15.svg"},
     {"key": "amenity", "value": "pub", "description": "🄿 Pub", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/beer-15.svg"},
     {"key": "microbrewery", "value": "yes", "description": "🄿 Brewpub", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/beer-15.svg"},
     {"key": "amenity", "value": "public_bath", "description": "🄿 Public Bath", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
@@ -207,7 +207,7 @@
     {"key": "cuisine", "value": "turkish", "description": "🄿 Turkish Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"},
     {"key": "cuisine", "value": "vietnamese", "description": "🄿 Vietnamese Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-noodle-15.svg"},
     {"key": "amenity", "value": "sanitary_dump_station", "description": "🄿 RV Toilet Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_tank.svg"},
-    {"key": "amenity", "value": "school", "description": "🄿 School Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/school.svg"},
+    {"key": "amenity", "value": "school", "description": "🄿 School Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/school.svg"},
     {"key": "amenity", "value": "shelter", "description": "🄿 Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
     {"key": "shelter_type", "value": "gazebo", "description": "🄿 Gazebo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
     {"key": "shelter_type", "value": "lean_to", "description": "🄿 Lean-To", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sleep_shelter.svg"},
@@ -236,7 +236,7 @@
     {"key": "amenity", "value": "townhall", "description": "🄿 Town Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
     {"key": "townhall:type", "value": "city", "description": "🄿 City Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
     {"key": "amenity", "value": "toy_library", "description": "🄿 Toy Library", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-chess-knight.svg"},
-    {"key": "amenity", "value": "university", "description": "🄿 University Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/college-15.svg"},
+    {"key": "amenity", "value": "university", "description": "🄿 University Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/college-15.svg"},
     {"key": "amenity", "value": "vehicle_inspection", "description": "🄿 Vehicle Inspection", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "amenity", "value": "vending_machine", "description": "🄿 Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vending_machine.svg"},
     {"key": "vending", "value": "bottle_return", "description": "🄿 Bottle Return Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vending_machine.svg"},
@@ -266,8 +266,8 @@
     {"key": "amenity", "value": "waste_disposal", "description": "🄿 Garbage Dumpster", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dumpster.svg"},
     {"key": "amenity", "value": "waste_transfer_station", "description": "🄿 Waste Transfer Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waste-basket-15.svg"},
     {"key": "waste", "value": "dog_excrement", "description": "🄿 Dog Excrement Bin", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waste-basket-15.svg"},
-    {"key": "amenity", "value": "water_point", "description": "🄿 RV Drinking Water", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
-    {"key": "amenity", "value": "watering_place", "description": "🄿 Animal Watering Place", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
+    {"key": "amenity", "value": "water_point", "description": "🄿 RV Drinking Water", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
+    {"key": "amenity", "value": "watering_place", "description": "🄿 Animal Watering Place", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
     {"key": "amenity", "value": "weighbridge", "description": "🄿 Truck Scale", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-weight.svg"},
     {"key": "area", "value": "yes", "description": "🄿 Area, 🄿 Pedestrian Area", "object_types": ["area"]},
     {"key": "area:highway", "description": "🄿 Road Area, 🄵 Type", "object_types": ["area"]},
@@ -650,7 +650,7 @@
     {"key": "leisure", "value": "miniature_golf", "description": "🄿 Miniature Golf", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
     {"key": "leisure", "value": "nature_reserve", "description": "🄿 Nature Reserve", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-15.svg"},
     {"key": "leisure", "value": "outdoor_seating", "description": "🄿 Outdoor Seating Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/picnic-site-15.svg"},
-    {"key": "leisure", "value": "park", "description": "🄿 Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tree_and_bench.svg"},
+    {"key": "leisure", "value": "park", "description": "🄿 Park", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tree_and_bench.svg"},
     {"key": "leisure", "value": "picnic_table", "description": "🄿 Picnic Table", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/picnic-site-15.svg"},
     {"key": "sport", "value": "chess", "description": "🄿 Chess Table, 🄿 Giant Chess Board", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-chess-pawn.svg"},
     {"key": "leisure", "value": "pitch", "description": "🄿 Sport Pitch", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
@@ -685,7 +685,7 @@
     {"key": "sport", "value": "swimming", "description": "🄿 Swimming Pool Facility", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
     {"key": "leisure", "value": "stadium", "description": "🄿 Stadium", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "leisure", "value": "swimming_area", "description": "🄿 Natural Swimming Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
-    {"key": "leisure", "value": "swimming_pool", "description": "🄿 Swimming Pool", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimming-pool.svg"},
+    {"key": "leisure", "value": "swimming_pool", "description": "🄿 Swimming Pool", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimming-pool.svg"},
     {"key": "leisure", "value": "track", "description": "🄿 Racetrack (Non-Motorsport)", "object_types": ["way", "node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/other-line.svg"},
     {"key": "sport", "value": "cycling", "description": "🄿 Cycling Track", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-biking.svg"},
     {"key": "sport", "value": "horse_racing", "description": "🄿 Horse Racing Track", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"},
@@ -734,7 +734,7 @@
     {"key": "pipeline", "value": "valve", "description": "🄿 Pipeline Valve", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wheel.svg"},
     {"key": "man_made", "value": "pumping_station", "description": "🄿 Pumping Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "silo", "description": "🄿 Silo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"},
-    {"key": "man_made", "value": "storage_tank", "description": "🄿 Storage Tank", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_tank.svg"},
+    {"key": "man_made", "value": "storage_tank", "description": "🄿 Storage Tank", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_tank.svg"},
     {"key": "content", "value": "water", "description": "🄿 Water Tank", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_tank.svg"},
     {"key": "man_made", "value": "street_cabinet", "description": "🄿 Street Cabinet", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-door-closed.svg"},
     {"key": "man_made", "value": "surveillance", "description": "🄿 Surveillance", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/security_camera.svg"},
@@ -750,7 +750,7 @@
     {"key": "man_made", "value": "utility_pole", "description": "🄿 Utility Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/utility_pole.svg"},
     {"key": "man_made", "value": "wastewater_plant", "description": "🄿 Wastewater Plant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/waste.svg"},
     {"key": "man_made", "value": "water_tap", "description": "🄿 Water Tap", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
-    {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/water_tower.svg"},
+    {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/water_tower.svg"},
     {"key": "man_made", "value": "water_well", "description": "🄿 Water Well", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "water_works", "description": "🄿 Water Works", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "watermill", "description": "🄿 Watermill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/watermill-15.svg"},
@@ -777,7 +777,7 @@
     {"key": "natural", "value": "heath", "description": "🄿 Heath", "object_types": ["area"]},
     {"key": "natural", "value": "mud", "description": "🄿 Mud", "object_types": ["area"]},
     {"key": "natural", "value": "peak", "description": "🄿 Peak", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/mountain-15.svg"},
-    {"key": "natural", "value": "reef", "description": "🄿 Reef", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/beach.svg"},
+    {"key": "natural", "value": "reef", "description": "🄿 Reef", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/beach.svg"},
     {"key": "natural", "value": "ridge", "description": "🄿 Ridge", "object_types": ["way"]},
     {"key": "natural", "value": "rock", "description": "🄿 Attached Rock / Boulder", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/boulder2.svg"},
     {"key": "natural", "value": "saddle", "description": "🄿 Saddle", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-stroked-15.svg"},
@@ -802,7 +802,7 @@
     {"key": "water", "value": "stream", "description": "🄿 Stream Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
     {"key": "water", "value": "wastewater", "description": "🄿 Wastewater Basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/waste.svg"},
     {"key": "natural", "value": "wetland", "description": "🄿 Wetland", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/wetland-15.svg"},
-    {"key": "natural", "value": "wood", "description": "🄿 Natural Wood", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"},
+    {"key": "natural", "value": "wood", "description": "🄿 Natural Wood", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"},
     {"key": "network:type", "value": "node_network", "description": "🄿 Recreational Network Node", "object_types": ["node"]},
     {"key": "noexit", "value": "yes", "description": "🄿 No Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
     {"key": "office", "description": "🄿 Office, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
@@ -1209,7 +1209,7 @@
     {"key": "waterway", "value": "sanitary_dump_station", "description": "🄿 Marine Toilet Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_tank.svg"},
     {"key": "intermittent", "value": "yes", "description": "🄿 Intermittent Stream", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
     {"key": "waterway", "value": "stream", "description": "🄿 Stream", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
-    {"key": "waterway", "value": "water_point", "description": "🄿 Marine Drinking Water", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
+    {"key": "waterway", "value": "water_point", "description": "🄿 Marine Drinking Water", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
     {"key": "waterway", "value": "waterfall", "description": "🄿 Waterfall", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waterfall-15.svg"},
     {"key": "waterway", "value": "weir", "description": "🄿 Weir", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dam-15.svg"},
     {"key": "access_aisle", "description": "🄵 Type"},