Merge branch '2.x' into cycleway-segregated

data/address-formats.json

@@ -161,6 +161,24 @@
         "neighbourhood": 0.5,
         "city": 0.5
       }
+    },
+    {
+      "countryCodes": ["pe"],
+      "format": [
+        ["street", "housenumber"],
+        ["neighbourhood"],
+        ["city", "state", "postcode"]
+      ],
+      "dropdowns": [
+        "street", "neighbourhood", "city", "state", "postcode"
+      ],
+      "widths": {
+        "street": 0.7,
+        "housenumber": 0.3,
+        "city": 0.4,
+        "state": 0.4,
+        "postcode": 0.2
+      }
     }
   ]
 }

data/deprecated.json

@@ -236,6 +236,10 @@
       "old": {"camp_site": "camp_pitch"},
       "replace": {"tourism": "camp_pitch"}
     },
+    {
+      "old": {"shop": "clothes", "clothes": "second_hand"},
+      "replace": {"shop": "clothes", "second_hand": "yes"}
+    },
     {
       "old": {"color": "*"},
       "replace": {"colour": "$1"}
@@ -372,6 +376,26 @@
       "old": {"embankment": "true"},
       "replace": {"embankment": "yes"}
     },
+    {
+      "old": {"entrance": "emergency_exit"},
+      "replace": {"entrance": "emergency"}
+    },
+    {
+      "old": {"entrance": "fire_exit"},
+      "replace": {"entrance": "emergency"}
+    },
+    {
+      "old": {"entrance": "loading_dock"},
+      "replace": {"amenity": "loading_dock"}
+    },
+    {
+      "old": {"entrance": "main_entrance"},
+      "replace": {"entrance": "main"}
+    },
+    {
+      "old": {"entrance": "private"},
+      "replace": {"entrance": "yes", "access": "private"}
+    },
     {
       "old": {"escalator": "*"},
       "replace": {"highway": "steps", "conveying": "$1"}
@@ -440,6 +464,18 @@
       "old": {"footway": "separate"},
       "replace": {"sidewalk": "separate"}
     },
+    {
+      "old": {"amenity": "gambling", "gambling": "casino"},
+      "replace": {"amenity": "casino"}
+    },
+    {
+      "old": {"leisure": "amusement_arcade", "gambling": "*"},
+      "replace": {"leisure": "adult_gaming_centre", "gambling": "$1"}
+    },
+    {
+      "old": {"gambling": "slot_machine"},
+      "replace": {"gambling": "slot_machines"}
+    },
     {
       "old": {"generator:source": "photovoltaic"},
       "replace": {"generator:source": "solar", "generator:method": "photovoltaic"}
@@ -711,6 +747,22 @@
       "old": {"mining_resource": "*"},
       "replace": {"resource": "$1"}
     },
+    {
+      "old": {"museum_type": "art"},
+      "replace": {"museum": "art"}
+    },
+    {
+      "old": {"museum_type": "history"},
+      "replace": {"museum": "history"}
+    },
+    {
+      "old": {"museum_type": "private"},
+      "replace": {"operator:type": "private"}
+    },
+    {
+      "old": {"museum_type": "public"},
+      "replace": {"operator:type": "public"}
+    },
     {
       "old": {"natural": "marsh"},
       "replace": {"natural": "wetland", "wetland": "marsh"}
@@ -757,6 +809,29 @@
     {
       "old": {"oneway": "unknown"}
     },
+    {
+      "old": {"operator:type": "goverment"},
+      "replace": {"operator:type": "government"}
+    },
+    {
+      "old": {"operator:type": "Privado"},
+      "replace": {"operator:type": "private"}
+    },
+    {
+      "old": {"operator:type": "Private"},
+      "replace": {"operator:type": "private"}
+    },
+    {
+      "old": {"operator:type": "Public"},
+      "replace": {"operator:type": "public"}
+    },
+    {
+      "old": {"operator:type": "Publico"},
+      "replace": {"operator:type": "public"}
+    },
+    {
+      "old": {"operator:type": "unknown"}
+    },
     {
       "old": {"place_name": "*"},
       "replace": {"name": "$1"}

data/phone-formats.json

@@ -40,6 +40,7 @@
     "ms": "+1-664-555-1234",
     "nl": "+31 42 123 4567",
     "no": "+47 22 12 34 56",
+    "pe": "+51 1 1234567",
     "pl": "+48 42 123 4567",
     "pr": "+1-787-555-1234",
     "pt": "+351 211 123456",

data/presets.yaml

@@ -235,6 +235,18 @@ en:
       attraction:
         # attraction=*
         label: Type
+      baby_feeding:
+        # baby_feeding=*
+        label: Baby Nursing Area
+        options:
+          # baby_feeding=no
+          'no': None
+          # baby_feeding=room
+          room: Dedicated Room
+          # baby_feeding=yes
+          'yes': Marked Space
+        # 'terms: baby feeding,breastfeeding,lactation,mothers,nursing'
+        terms: '[translate with synonyms or related terms for ''Baby Nursing Area'', separated by commas]'
       baby_seat:
         # baby=*
         label: Baby Seat
@@ -371,6 +383,7 @@ en:
       building_area:
         # building=*
         label: Building
+        terms: '[translate with synonyms or related terms for ''Building'', separated by commas]'
       bunker_type:
         # bunker_type=*
         label: Type
@@ -522,6 +535,8 @@ en:
       cuisine:
         # cuisine=*
         label: Cuisines
+        # 'terms: fare,food types'
+        terms: '[translate with synonyms or related terms for ''Cuisines'', separated by commas]'
       currency_multi:
         # 'currency:=*'
         label: Currency Types
@@ -885,6 +900,9 @@ en:
       fuel_multi:
         # 'fuel:=*'
         label: Fuel Types
+      gambling:
+        # gambling=*
+        label: Games
       gauge:
         # gauge=*
         label: Gauge
@@ -1402,6 +1420,9 @@ en:
         # mtb/scale/uphill field placeholder
         placeholder: '0, 1, 2, 3...'
         terms: '[translate with synonyms or related terms for ''Mountain Biking Uphill Difficulty'', separated by commas]'
+      museum:
+        # museum=*
+        label: Type
       name:
         # name=*
         label: Name
@@ -3171,6 +3192,7 @@ en:
       amenity/grave_yard:
         # amenity=grave_yard
         name: Graveyard
+        # 'terms: burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb'
         terms: '<translate with synonyms or related terms for ''Graveyard'', separated by commas>'
       amenity/grit_bin:
         # amenity=grit_bin
@@ -4107,6 +4129,10 @@ en:
         # barrier=stile
         name: Stile
         terms: '<translate with synonyms or related terms for ''Stile'', separated by commas>'
+      barrier/swing_gate:
+        # barrier=swing_gate
+        name: Swing Gate
+        terms: '<translate with synonyms or related terms for ''Swing Gate'', separated by commas>'
       barrier/toll_booth:
         # barrier=toll_booth
         name: Toll Booth
@@ -4701,6 +4727,11 @@ en:
         name: Entrance/Exit
         # 'terms: entrance,exit,door'
         terms: '<translate with synonyms or related terms for ''Entrance/Exit'', separated by commas>'
+      entrance/emergency:
+        # entrance=emergency
+        name: Emergency Exit
+        # 'terms: fire exit,door'
+        terms: '<translate with synonyms or related terms for ''Emergency Exit'', separated by commas>'
       ford:
         # ford=yes
         name: Ford
@@ -5203,6 +5234,10 @@ en:
         # historic=boundary_stone
         name: Boundary Stone
         terms: '<translate with synonyms or related terms for ''Boundary Stone'', separated by commas>'
+      historic/building:
+        # historic=building
+        name: Historic Building
+        terms: '<translate with synonyms or related terms for ''Historic Building'', separated by commas>'
       historic/castle:
         # historic=castle
         name: Castle
@@ -5345,11 +5380,11 @@ en:
       landuse/cemetery:
         # landuse=cemetery
         name: Cemetery
+        # 'terms: burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb'
         terms: '<translate with synonyms or related terms for ''Cemetery'', separated by commas>'
       landuse/churchyard:
         # landuse=churchyard
         name: Churchyard
-        terms: '<translate with synonyms or related terms for ''Churchyard'', separated by commas>'
       landuse/commercial:
         # landuse=commercial
         name: Commercial Area
@@ -5498,6 +5533,7 @@ en:
       landuse/religious:
         # landuse=religious
         name: Religious Area
+        # 'terms: christian,churchyard,hindu,jewish,mosque,muslim,place of worship,shinto,sikh,taoist,temple,shrine,synagogue'
         terms: '<translate with synonyms or related terms for ''Religious Area'', separated by commas>'
       landuse/reservoir:
         # landuse=reservoir
@@ -6604,6 +6640,11 @@ en:
         # office=government
         name: Government Office
         terms: '<translate with synonyms or related terms for ''Government Office'', separated by commas>'
+      office/government/prosecutor:
+        # 'office=government, government=prosecutor'
+        name: Public Prosecutor's Office
+        # 'terms: attorney general,district attorney,prosecution'
+        terms: '<translate with synonyms or related terms for ''Public Prosecutor''s Office'', separated by commas>'
       office/government/register_office:
         # 'office=government, government=register_office'
         name: Register Office
@@ -6631,6 +6672,7 @@ en:
       office/lawyer:
         # office=lawyer
         name: Law Office
+        # 'terms: advocate,attorney,barrister,counsellor,counselor,defender,lawyer,legal,prosecutor'
         terms: '<translate with synonyms or related terms for ''Law Office'', separated by commas>'
       office/lawyer/notary:
         # 'office=lawyer, lawyer=notary'
@@ -7449,6 +7491,11 @@ en:
         name: Car Dealership
         # 'terms: automobile,automotive'
         terms: '<translate with synonyms or related terms for ''Car Dealership'', separated by commas>'
+      shop/car/second_hand:
+        # 'shop=car, second_hand=only'
+        name: Used Car Dealership
+        # 'terms: automobile,automotive'
+        terms: '<translate with synonyms or related terms for ''Used Car Dealership'', separated by commas>'
       shop/car_parts:
         # shop=car_parts
         name: Car Parts Store
@@ -7497,6 +7544,11 @@ en:
         name: Clothing Store
         # 'terms: blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear'
         terms: '<translate with synonyms or related terms for ''Clothing Store'', separated by commas>'
+      shop/clothes/second_hand:
+        # 'shop=clothes, second_hand=only'
+        name: Secondhand Clothing Store
+        # 'terms: blouses,clothes,consignment,dresses,pants,second hand,shirts,shorts,skirts,slacks,suits,used'
+        terms: '<translate with synonyms or related terms for ''Secondhand Clothing Store'', separated by commas>'
       shop/clothes/underwear:
         # 'shop=clothes, clothes=underwear'
         name: Underwear Store
@@ -7562,6 +7614,10 @@ en:
         # shop=doityourself
         name: DIY Store
         terms: '<translate with synonyms or related terms for ''DIY Store'', separated by commas>'
+      shop/doors:
+        # shop=doors
+        name: Door Shop
+        terms: '<translate with synonyms or related terms for ''Door Shop'', separated by commas>'
       shop/dry_cleaning:
         # shop=dry_cleaning
         name: Dry Cleaner
@@ -8237,6 +8293,16 @@ en:
         name: Museum
         # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*'
         terms: '<translate with synonyms or related terms for ''Museum'', separated by commas>'
+      tourism/museum/art:
+        # 'tourism=museum, museum=art'
+        name: Art Museum
+        # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*'
+        terms: '<translate with synonyms or related terms for ''Art Museum'', separated by commas>'
+      tourism/museum/history:
+        # 'tourism=museum, museum=history'
+        name: History Museum
+        # 'terms: artifacts,dioramas,exhibits,exhibitions,foundation,hall,institution'
+        terms: '<translate with synonyms or related terms for ''History Museum'', separated by commas>'
       tourism/picnic_site:
         # tourism=picnic_site
         name: Picnic Site

data/presets/README.md

@@ -150,8 +150,8 @@ preset are generally not inherited. E.g. the `shop` field is not inherited by `s
 The name of a local SVG icon file. You can use icons from any of the following icon sets. When specifying an icon, use the prefixed version of the name, for example `"icon": "maki-park"` or `"icon": "tnp-2009223"`.
 
 * [iD's spritesheet](https://github.com/openstreetmap/iD/tree/master/svg/iD-sprite/presets) (`iD-`)
-* [Maki](http://www.mapbox.com/maki/) (`maki-`), map-specific icons from Mapbox
-* [Temaki](http://bhousel.github.io/temaki/docs/) (`temaki-`), an expansion pack for Maki
+* [Maki](https://labs.mapbox.com/maki-icons/) (`maki-`), map-specific icons from Mapbox
+* [Temaki](https://ideditor.github.io/temaki/docs/) (`temaki-`), an expansion pack for Maki
     * This is the best place to submit a PR if you want to create a preset icon!
 * [Font Awesome](https://fontawesome.com/icons?d=gallery&m=free), thousands of general-purpose icons
     * There is a free and pro tier. You can use any icon from the free tier in the following styles:
@@ -508,4 +508,4 @@ A "name" field must be included:
     "label": "Name",
     "placeholder": "Common name (if any)"
 }
-```
+```

data/presets/categories.json

@@ -79,8 +79,7 @@
         "natural/coastline",
         "natural/tree_row",
         "natural/peak",
-        "natural/cliff",
-        "natural/beach"
+        "natural/cliff"
       ]
     },
     "category-path": {

data/presets/categories/natural.json

@@ -15,7 +15,6 @@
         "natural/coastline",
         "natural/tree_row",
         "natural/peak",
-        "natural/cliff",
-        "natural/beach"
+        "natural/cliff"
     ]
 }

data/presets/fields.json

@@ -27,6 +27,7 @@
     "artwork_type": {"key": "artwork_type", "type": "combo", "label": "Type"},
     "atm": {"key": "atm", "type": "check", "label": "ATM"},
     "attraction": {"key": "attraction", "type": "typeCombo", "label": "Type"},
+    "baby_feeding": {"key": "baby_feeding", "type": "combo", "label": "Baby Nursing Area", "strings": {"options": {"room": "Dedicated Room", "yes": "Marked Space", "no": "None"}}, "terms": ["baby feeding", "breastfeeding", "lactation", "mothers", "nursing"]},
     "baby_seat": {"key": "baby", "type": "check", "label": "Baby Seat"},
     "backcountry": {"key": "backcountry", "type": "check", "label": "Backcountry"},
     "backrest": {"key": "backrest", "type": "check", "label": "Backrest"},
@@ -92,7 +93,7 @@
     "crop": {"key": "crop", "type": "semiCombo", "label": "Crops"},
     "crossing": {"key": "crossing", "type": "combo", "label": "Type"},
     "crossing/island": {"key": "crossing:island", "type": "check", "label": "Refuge Island"},
-    "cuisine": {"key": "cuisine", "type": "semiCombo", "label": "Cuisines"},
+    "cuisine": {"key": "cuisine", "type": "semiCombo", "label": "Cuisines", "terms": ["fare", "food types"]},
     "currency_multi": {"key": "currency:", "type": "multiCombo", "label": "Currency Types", "terms": ["bills", "cash", "coins", "money"]},
     "cutting": {"key": "cutting", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
     "cycle_network": {"key": "cycle_network", "type": "networkCombo", "label": "Network"},
@@ -160,6 +161,7 @@
     "from": {"key": "from", "type": "text", "label": "From"},
     "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"},
     "fuel": {"key": "fuel", "type": "combo", "label": "Fuel"},
+    "gambling": {"key": "gambling", "type": "semiCombo", "label": "Games"},
     "gauge": {"key": "gauge", "type": "combo", "label": "Gauge"},
     "gender": {"type": "radio", "keys": ["male", "female", "unisex"], "label": "Gender", "placeholder": "Unknown", "strings": {"options": {"male": "Male", "female": "Female", "unisex": "Unisex"}}, "terms": ["access", "female", "male", "unisex"]},
     "generator/method": {"key": "generator:method", "type": "combo", "label": "Method"},
@@ -257,6 +259,7 @@
     "mtb/scale": {"key": "mtb:scale", "type": "combo", "label": "Mountain Biking Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Solid gravel/packed earth, no obstacles, wide curves", "1": "1: Some loose surface, small obstacles, wide curves", "2": "2: Much loose surface, large obstacles, easy hairpins", "3": "3: Slippery surface, large obstacles, tight hairpins", "4": "4: Loose surface or boulders, dangerous hairpins", "5": "5: Maximum difficulty, boulder fields, landslides", "6": "6: Not rideable except by the very best mountain bikers"}}},
     "mtb/scale/imba": {"key": "mtb:scale:imba", "type": "combo", "label": "IMBA Trail Difficulty", "placeholder": "Easy, Medium, Difficult...", "strings": {"options": {"0": "Easiest (white circle)", "1": "Easy (green circle)", "2": "Medium (blue square)", "3": "Difficult (black diamond)", "4": "Extremely Difficult (double black diamond)"}}},
     "mtb/scale/uphill": {"key": "mtb:scale:uphill", "type": "combo", "label": "Mountain Biking Uphill Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", "4": "4: Avg. incline <30%, poor condition, big rocks/branches", "5": "5: Very steep, bike generally needs to be pushed or carried"}}},
+    "museum": {"key": "museum", "type": "combo", "label": "Type"},
     "name": {"key": "name", "type": "localized", "label": "Name", "universal": true, "placeholder": "Common name (if any)", "terms": ["label", "title"]},
     "natural": {"key": "natural", "type": "typeCombo", "label": "Natural"},
     "network_bicycle": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lcn": "Local", "rcn": "Regional", "ncn": "National", "icn": "International"}}},

data/presets/fields/baby_feeding.json

@@ -0,0 +1,19 @@
+{
+    "key": "baby_feeding",
+    "type": "combo",
+    "label": "Baby Nursing Area",
+    "strings": {
+        "options": {
+            "room": "Dedicated Room",
+            "yes": "Marked Space",
+            "no": "None"
+        }
+    },
+    "terms": [
+        "baby feeding",
+        "breastfeeding",
+        "lactation",
+        "mothers",
+        "nursing"
+    ]
+}

data/presets/fields/cuisine.json

@@ -1,5 +1,9 @@
 {
     "key": "cuisine",
     "type": "semiCombo",
-    "label": "Cuisines"
+    "label": "Cuisines",
+    "terms": [
+        "fare",
+        "food types"
+    ]
 }

data/presets/fields/gambling.json

@@ -0,0 +1,5 @@
+{
+    "key": "gambling",
+    "type": "semiCombo",
+    "label": "Games"
+}

data/presets/fields/museum.json

@@ -0,0 +1,5 @@
+{
+    "key": "museum",
+    "type": "combo",
+    "label": "Type"
+}

data/presets/presets.json

@@ -53,7 +53,7 @@
     "aeroway/runway": {"icon": "fas-plane-departure", "geometry": ["line", "area"], "terms": ["landing strip"], "fields": ["ref_runway", "surface", "length", "width"], "tags": {"aeroway": "runway"}, "name": "Runway"},
     "aeroway/spaceport": {"icon": "fas-space-shuttle", "geometry": ["area", "point"], "fields": ["name", "operator", "access_simple", "website", "wikidata"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone"], "terms": ["cosmodrome", "rocket launch center", "rocket launch complex", "rocket launch site", "rocket range", "space port"], "tags": {"aeroway": "spaceport"}, "name": "Spaceport"},
     "aeroway/taxiway": {"icon": "fas-plane", "geometry": ["line"], "fields": ["ref_taxiway", "surface"], "tags": {"aeroway": "taxiway"}, "name": "Taxiway"},
-    "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["airport", "aerodrome"], "fields": ["name", "operator", "building_area"], "moreFields": ["smoking", "wheelchair"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"},
+    "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["airport", "aerodrome"], "fields": ["name", "operator", "building_area", "wheelchair", "baby_feeding"], "moreFields": ["smoking"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"},
     "aeroway/windsock": {"icon": "fas-wind", "geometry": ["point", "vertex"], "fields": ["ref", "lit", "height"], "moreFields": ["manufacturer"], "tags": {"aeroway": "windsock"}, "name": "Windsock"},
     "allotments/plot": {"geometry": ["area"], "fields": ["name", "ref"], "tags": {"allotments": "plot"}, "reference": {"key": "allotments", "value": "plot"}, "name": "Community Garden Plot"},
     "amenity/bus_station": {"icon": "maki-bus", "fields": ["name", "building_area", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "bus_station"}, "name": "Bus Station / Terminal", "searchable": false, "replacement": "public_transport/station_bus"},
@@ -71,7 +71,7 @@
     "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"},
     "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "height", "indoor", "level", "lit", "manufacturer", "name", "opening_hours", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
     "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "brand", "currency_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
-    "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "min_age", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "opening_hours", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
+    "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "min_age", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "opening_hours", "operator", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
     "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgbtq bar", "lgbt bar", "lgb bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"},
     "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "moreFields": ["lit"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
     "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "level", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"},
@@ -81,7 +81,7 @@
     "amenity/bicycle_parking/shed": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "shed"}, "reference": {"key": "bicycle_parking"}, "terms": ["cycle shed", "cycling", "Bike Shed"], "name": "Bicycle Shed"},
     "amenity/bicycle_rental": {"icon": "temaki-bicycle_rental", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "covered", "email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "cycle dock", "cycle hub", "cycleshare", "cycling"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
     "amenity/bicycle_repair_station": {"icon": "temaki-bicycle_repair", "fields": ["operator", "brand", "opening_hours", "fee", "payment_multi_fee", "charge_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike chain", "bike multitool", "bike repair", "bike tools", "cycle pump", "cycle repair", "cycling"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
-    "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
+    "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "opening_hours", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}", "building_area", "cuisine"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
     "amenity/boat_rental": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "operator/type", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
     "amenity/bureau_de_change": {"icon": "temaki-money_hand", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
     "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "bar", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access/ssid", "level", "min_age", "not/name", "opening_hours", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
@@ -89,9 +89,9 @@
     "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
     "amenity/car_sharing": {"icon": "temaki-sign_and_car", "fields": ["name", "operator", "operator/type", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["brand", "email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing Station"},
     "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
-    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
+    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "gambling", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
     "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["brand", "covered", "level", "manufacturer"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
-    "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
+    "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
     "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "email", "fax", "gnis/feature_id", "level", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
     "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "brand", "email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
     "amenity/clinic/abortion": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "abortion"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Abortion Clinic"},
@@ -99,7 +99,7 @@
     "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": ["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": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "baby_feeding", "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"},
@@ -128,7 +128,7 @@
     "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["capacity", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "outdoor_seating", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
     "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "fountain", "drinking_water", "height", "lit"], "moreFields": ["covered", "indoor", "level", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "terms": ["basin", "water"], "name": "Fountain"},
     "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/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "terms": ["burial ground", "cemetary", "cemetery", "churchyard", "columbarium", "grave yard", "graveyard", "mausoleum", "tomb"], "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": ["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"},
@@ -138,7 +138,7 @@
     "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/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", "baby_feeding", "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"},
@@ -156,9 +156,9 @@
     "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"], "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"},
+    "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "opening_hours", "dispensing", "drive_through"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "level", "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"},
     "amenity/photo_booth": {"icon": "fas-person-booth", "fields": ["name", "operator", "payment_multi", "wheelchair"], "moreFields": ["brand", "indoor", "level"], "geometry": ["point", "area"], "terms": ["photobooth", "photo", "booth", "kiosk", "camera"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"},
-    "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "opening_hours", "phone", "polling_station", "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", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
+    "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "opening_hours", "phone", "polling_station", "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", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
     "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
     "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
     "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "jehovahs_witness"}, "reference": {"key": "denomination", "value": "jehovahs_witness"}, "name": "Kingdom Hall of Jehovah's Witnesses"},
@@ -178,7 +178,7 @@
     "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": ["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": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "cuisine", "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"},
     "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
@@ -189,7 +189,7 @@
     "amenity/recycling/container/electrical_items": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["computers", "electronic waste", "electronics recycling", "ewaste bin", "phones", "tablets"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:electrical_items": "yes"}, "reference": {"key": "recycling:electrical_items", "value": "yes"}, "name": "E-Waste Container"},
     "amenity/recycling/container/green_waste": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["biodegradable", "biological", "compost", "decomposable", "garbage bin", "garden waste", "organic", "rubbish", "food scrap"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:green_waste": "yes"}, "reference": {"key": "recycling:green_waste", "value": "yes"}, "name": "Green Waste Container"},
     "amenity/research_institute": {"icon": "fas-flask", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["applied research", "experimentation", "r&d", "r & d", "r and d", "research and development", "research institution", "research laboratory", "research labs"], "tags": {"amenity": "research_institute"}, "name": "Research Institute Grounds"},
-    "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brand", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "ref/vatin", "reservation", "smoking", "stars", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
+    "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone", "website"], "moreFields": ["air_conditioning", "bar", "brand", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "ref/vatin", "reservation", "smoking", "stars", "takeaway", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
     "amenity/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"},
     "amenity/restaurant/asian": {"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": "asian"}, "reference": {"key": "cuisine", "value": "asian"}, "name": "Asian Restaurant"},
     "amenity/restaurant/chinese": {"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": "chinese"}, "reference": {"key": "cuisine", "value": "chinese"}, "name": "Chinese Restaurant"},
@@ -217,8 +217,8 @@
     "amenity/shelter/public_transport": {"icon": "temaki-transit_shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
     "amenity/shower": {"icon": "temaki-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "hot_water", "wheelchair"], "moreFields": ["address", "gender", "level", "operator"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
     "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "moreFields": ["covered", "level", "lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
-    "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "brand", "operator", "operator/type", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"},
-    "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "operator/type", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
+    "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "brand", "operator", "operator/type", "address", "building_area"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"},
+    "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "operator/type", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
     "amenity/social_facility/ambulatory_care": {"icon": "maki-wheelchair", "geometry": ["point", "area"], "tags": {"amenity": "social_facility", "social_facility": "ambulatory_care"}, "reference": {"key": "social_facility", "value": "ambulatory_care"}, "name": "Ambulatory Care"},
     "amenity/social_facility/food_bank": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility", "social_facility": "food_bank"}, "reference": {"key": "social_facility", "value": "food_bank"}, "name": "Food Bank"},
     "amenity/social_facility/group_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["old", "senior", "living", "care home", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "group_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "group_home"}, "name": "Elderly Group Home"},
@@ -236,7 +236,7 @@
     "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
     "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"},
     "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"},
-    "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": {"icon": "maki-town-hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["baby_feeding", "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": ["area", "point"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
@@ -305,7 +305,7 @@
     "barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25},
     "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height", "material"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25},
     "barrier/fence/railing": {"icon": "temaki-railing", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "terms": ["railing", "handrail", "guard rail"], "name": "Railing", "matchScore": 0.5},
-    "barrier/gate": {"icon": "temaki-gate", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
+    "barrier/gate": {"icon": "temaki-gate", "fields": ["access", "wheelchair", "opening_hours", "height", "material"], "moreFields": ["colour", "manufacturer", "operator", "ref"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
     "barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75},
     "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
     "barrier/height_restrictor": {"icon": "temaki-height_restrictor", "fields": ["maxheight"], "geometry": ["vertex"], "tags": {"barrier": "height_restrictor"}, "name": "Height Restrictor"},
@@ -315,10 +315,11 @@
     "barrier/kerb/raised": {"icon": "temaki-kerb-raised", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "raised"}, "addTags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "matchScore": 0.55, "name": "Raised Curb"},
     "barrier/kerb/rolled": {"icon": "temaki-kerb-rolled", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "rolled"}, "addTags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "matchScore": 0.55, "name": "Rolled Curb"},
     "barrier/kissing_gate": {"icon": "temaki-gate", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
-    "barrier/lift_gate": {"icon": "temaki-lift_gate", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
+    "barrier/lift_gate": {"icon": "temaki-lift_gate", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
     "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
     "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["Postern", "castle side gate"], "name": "Sally Port"},
     "barrier/stile": {"icon": "maki-roadblock", "fields": ["access", "stile", "material"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"},
+    "barrier/swing_gate": {"icon": "temaki-gate", "fields": ["{barrier/gate}"], "moreFields": ["{barrier/gate}"], "geometry": ["vertex"], "tags": {"barrier": "swing_gate"}, "name": "Swing Gate"},
     "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "email", "fax", "opening_hours", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"},
     "barrier/turnstile": {"icon": "temaki-turnstile", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"},
     "barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25},
@@ -337,11 +338,11 @@
     "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
     "building/cabin": {"icon": "temaki-cabin", "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"},
     "building/carport": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"},
-    "building/cathedral": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"},
+    "building/cathedral": {"icon": "fas-church", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"},
     "building/chapel": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "chapel"}, "matchScore": 0.5, "name": "Chapel Building"},
-    "building/church": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"},
+    "building/church": {"icon": "fas-church", "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"},
     "building/civic": {"icon": "maki-building", "fields": ["{building}", "smoking"], "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "tags": {"building": "civic"}, "matchScore": 0.5, "name": "Civic Building"},
-    "building/college": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["university"], "tags": {"building": "college"}, "matchScore": 0.5, "name": "College Building"},
+    "building/college": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["university"], "tags": {"building": "college"}, "matchScore": 0.5, "name": "College Building"},
     "building/commercial": {"icon": "maki-suitcase", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "commercial"}, "matchScore": 0.5, "name": "Commercial Building"},
     "building/construction": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "construction"}, "matchScore": 0.5, "name": "Building Under Construction"},
     "building/detached": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "detached"}, "terms": ["home", "single", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Detached House"},
@@ -353,21 +354,21 @@
     "building/grandstand": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"},
     "building/greenhouse": {"icon": "maki-garden-centre", "geometry": ["area"], "tags": {"building": "greenhouse"}, "matchScore": 0.5, "name": "Greenhouse"},
     "building/hangar": {"icon": "fas-warehouse", "fields": ["name"], "geometry": ["area"], "tags": {"building": "hangar"}, "matchScore": 0.5, "name": "Hangar Building"},
-    "building/hospital": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"},
-    "building/hotel": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"},
+    "building/hospital": {"icon": "fas-hospital-alt", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"},
+    "building/hotel": {"icon": "fas-hotel", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"},
     "building/house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "house"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "House"},
     "building/houseboat": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "houseboat"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Houseboat"},
     "building/hut": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "hut"}, "matchScore": 0.5, "name": "Hut"},
     "building/industrial": {"icon": "maki-industry", "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial Building"},
-    "building/kindergarten": {"icon": "maki-building", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"},
-    "building/mosque": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"},
+    "building/kindergarten": {"icon": "fas-school", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"},
+    "building/mosque": {"icon": "fas-mosque", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"},
     "building/pavilion": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "terms": ["sports"], "tags": {"building": "pavilion"}, "matchScore": 0.5, "name": "Pavilion Building"},
     "building/public": {"icon": "maki-building", "fields": ["{building}", "smoking"], "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "tags": {"building": "public"}, "matchScore": 0.5, "name": "Public Building"},
     "building/residential": {"icon": "maki-residential-community", "geometry": ["area"], "tags": {"building": "residential"}, "matchScore": 0.5, "name": "Residential Building"},
     "building/retail": {"icon": "maki-commercial", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "retail"}, "matchScore": 0.5, "name": "Retail Building"},
     "building/roof": {"icon": "maki-shelter", "fields": ["{building}", "layer"], "geometry": ["area"], "tags": {"building": "roof"}, "matchScore": 0.5, "name": "Roof"},
     "building/ruins": {"icon": "temaki-ruins", "geometry": ["area"], "tags": {"building": "ruins"}, "matchScore": 0.5, "name": "Building Ruins"},
-    "building/school": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"},
+    "building/school": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"},
     "building/semidetached_house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "semidetached_house"}, "terms": ["home", "double", "duplex", "twin", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Semi-Detached House"},
     "building/service": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "service"}, "matchScore": 0.5, "name": "Service Building"},
     "building/shed": {"icon": "fas-warehouse", "fields": ["{building}", "lockable"], "geometry": ["area"], "tags": {"building": "shed"}, "matchScore": 0.5, "name": "Shed"},
@@ -377,7 +378,7 @@
     "building/temple": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "temple"}, "matchScore": 0.5, "name": "Temple Building"},
     "building/terrace": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "terrace"}, "terms": ["home", "terrace", "brownstone", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Row Houses"},
     "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"},
-    "building/university": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"},
+    "building/university": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"},
     "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"},
     "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
     "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
@@ -435,7 +436,7 @@
     "craft/window_construction": {"icon": "temaki-window", "geometry": ["point", "area"], "terms": ["glass"], "tags": {"craft": "window_construction"}, "name": "Window Construction"},
     "craft/winery": {"icon": "maki-alcohol-shop", "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"},
     "cycleway/asl": {"icon": "maki-bicycle", "fields": ["ref", "direction_vertex", "width"], "geometry": ["vertex"], "tags": {"cycleway": "asl"}, "terms": ["advanced stop box", "asl", "bicycle box", "bike box", "bikebox", "cycle box", "cycle stop marking"], "name": "Advanced Stop Line"},
-    "demolished/building": {"fields": ["name", "address"], "geometry": ["area"], "tags": {"demolished:building": "*"}, "name": "Recently Demolished Building", "searchable": false},
+    "demolished/building": {"icon": "fas-house-damage", "fields": ["name", "address"], "geometry": ["area"], "tags": {"demolished:building": "*"}, "name": "Recently Demolished Building", "searchable": false},
     "disused/railway": {"fields": ["disused/railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"disused:railway": "*"}, "matchScore": 0.05, "searchable": false, "name": "Disused Railway Feature"},
     "emergency/designated": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "designated"}, "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01},
     "emergency/destination": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "destination"}, "name": "Emergency Access Destination", "searchable": false, "matchScore": 0.01},
@@ -455,7 +456,8 @@
     "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
     "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
     "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
-    "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "level", "address"], "matchScore": 0.8, "name": "Entrance/Exit"},
+    "entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "entrance", "door", "access_simple", "wheelchair", "level", "address"], "geometry": ["vertex"], "tags": {"entrance": "*"}, "terms": ["entrance", "exit", "door"], "matchScore": 0.8, "name": "Entrance/Exit"},
+    "entrance/emergency": {"icon": "maki-entrance-alt1", "fields": ["ref", "door", "access_simple", "level"], "geometry": ["vertex"], "tags": {"entrance": "emergency"}, "terms": ["fire exit", "door"], "matchScore": 0.8, "name": "Emergency Exit"},
     "ford": {"icon": "temaki-pedestrian", "fields": ["name", "access", "seasonal"], "moreFields": ["gnis/feature_id"], "geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
     "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker"}, "addTags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "name": "Sand Trap"},
     "golf/cartpath": {"icon": "temaki-golf_cart", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "name": "Golf Cartpath"},
@@ -560,9 +562,10 @@
     "highway/turning_circle": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "turning_circle"}, "terms": ["cul-de-sac"], "name": "Turning Circle"},
     "highway/turning_loop": {"icon": "maki-circle", "geometry": ["vertex"], "tags": {"highway": "turning_loop"}, "terms": ["cul-de-sac"], "name": "Turning Loop (Island)"},
     "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"},
-    "historic": {"icon": "temaki-ruins", "fields": ["historic", "inscription"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"historic": "*"}, "name": "Historic Site"},
+    "historic": {"icon": "temaki-ruins", "fields": ["historic", "inscription"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"historic": "*"}, "matchScore": 0.5, "name": "Historic Site"},
     "historic/archaeological_site": {"icon": "temaki-ruins", "fields": ["name", "site_type", "historic/civilization", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "archaeological_site"}, "name": "Archaeological Site"},
     "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "moreFields": ["{historic}", "material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"},
+    "historic/building": {"icon": "maki-home", "fields": ["{building}", "start_date"], "moreFields": ["{building}", "access_simple"], "geometry": ["area"], "tags": {"historic": "building"}, "addTags": {"historic": "building", "building": "*"}, "reference": {"key": "historic", "value": "building"}, "matchScore": 0.5, "name": "Historic Building"},
     "historic/castle": {"icon": "maki-castle", "fields": ["name", "castle_type", "building_area", "historic/civilization", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "castle"}, "name": "Castle"},
     "historic/castle/fortress": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "fortress"}, "tags": {"historic": "castle", "castle_type": "fortress"}, "terms": ["citadel", "military"], "name": "Historic Fortress"},
     "historic/castle/palace": {"icon": "fas-crown", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "palace"}, "tags": {"historic": "castle", "castle_type": "palace"}, "terms": ["Royal Residence", "royal", "king", "queen"], "name": "Palace"},
@@ -589,14 +592,14 @@
     "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/ssid", "internet_access/fee"], "moreFields": ["level"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"},
     "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"},
     "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "name": "Basin", "searchable": false},
+    "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["{landuse/religious}"], "moreFields": ["{landuse/religious}"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "searchable": false, "name": "Churchyard"},
     "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false},
     "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false},
     "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false},
     "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
     "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"},
     "landuse/brownfield": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"},
-    "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"},
-    "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"},
+    "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": ["burial ground", "cemetary", "cemetery", "churchyard", "columbarium", "grave yard", "graveyard", "mausoleum", "tomb"], "name": "Cemetery"},
     "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"},
     "landuse/construction": {"icon": "temaki-bulldozer", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": ["building", "bulldozer", "construction site", "construction zone", "crane", "demolition", "development", "infrastructure"], "name": "Construction Area"},
     "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
@@ -626,28 +629,28 @@
     "landuse/quarry": {"geometry": ["area"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
     "landuse/railway": {"icon": "maki-rail", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"},
     "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
-    "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"},
-    "landuse/residential": {"icon": "maki-building", "fields": ["name", "residential"], "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"},
-    "landuse/residential/apartments": {"icon": "maki-building", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"},
+    "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": ["christian", "churchyard", "hindu", "jewish", "mosque", "muslim", "place of worship", "shinto", "sikh", "taoist", "temple", "shrine", "synagogue"], "name": "Religious Area"},
+    "landuse/residential": {"icon": "maki-residential-community", "fields": ["name", "residential"], "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"},
+    "landuse/residential/apartments": {"icon": "maki-residential-community", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"},
     "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
     "landuse/vineyard": {"icon": "temaki-grapes", "fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
     "landuse/winter_sports": {"icon": "fas-skiing", "geometry": ["area"], "fields": ["name", "operator"], "moreFields": ["access_simple", "address", "opening_hours"], "tags": {"landuse": "winter_sports"}, "terms": ["piste area", "ski area", "ski hill", "ski mountain", "ski resort", "snow board area", "snowboard area"], "name": "Winter Sports Area"},
     "leisure/adult_gaming_centre": {"icon": "temaki-casino", "fields": ["{amenity/casino}"], "moreFields": ["{amenity/casino}"], "geometry": ["point", "area"], "terms": ["gambling", "slot machine"], "tags": {"leisure": "adult_gaming_centre"}, "name": "Adult Gaming Center"},
-    "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
+    "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
     "leisure/bandstand": {"icon": "fas-music", "fields": ["name", "building_area", "operator"], "moreFields": ["gnis/feature_id", "website"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"},
     "leisure/beach_resort": {"icon": "fas-umbrella-beach", "fields": ["name", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "smoking", "website"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
     "leisure/bird_hide": {"icon": "temaki-binoculars", "fields": ["name", "building_area", "address", "opening_hours"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bird_hide"}, "terms": ["machan", "ornithology"], "name": "Bird Hide"},
     "leisure/bleachers": {"icon": "temaki-bleachers", "geometry": ["area"], "tags": {"leisure": "bleachers"}, "terms": ["crowd", "bench", "sports", "stand", "stands", "seat", "seating"], "name": "Bleachers"},
-    "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
+    "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
     "leisure/common": {"icon": "temaki-pedestrian", "fields": ["name", "access_simple"], "moreFields": ["gnis/feature_id", "website"], "geometry": ["area", "point"], "terms": ["open space"], "tags": {"leisure": "common"}, "name": "Common"},
     "leisure/dance": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"},
     "leisure/dancing_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"},
     "leisure/disc_golf_course": {"icon": "temaki-disc_golf_basket", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["address", "dog", "email", "fax", "gnis/feature_id", "lit", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "tags": {"leisure": "disc_golf_course"}, "addTags": {"leisure": "disc_golf_course", "sport": "disc_golf"}, "terms": ["disk golf", "frisbee golf", "flying disc golf", "frolf", "ultimate"], "name": "Disc Golf Course"},
-    "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
+    "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name", "operator", "operator/type", "address", "access_simple", "website"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "ref"], "geometry": ["area", "point"], "tags": {"leisure": "dog_park"}, "terms": [], "name": "Dog Park"},
     "leisure/escape_game": {"icon": "fas-puzzle-piece", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["escape game", "escape the room", "puzzle room", "quest room"], "tags": {"leisure": "escape_game"}, "name": "Escape Room"},
     "leisure/firepit": {"icon": "temaki-campfire", "fields": ["access_simple", "seasonal", "width"], "moreFields": ["ref"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["bonfire", "campfire", "fire circle", "fire hole", "fire place", "fire ring", "firepit", "fireplace", "firering"], "name": "Fire Pit"},
     "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple", "fishing"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
-    "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "pilates", "studio"], "name": "Gym / Fitness Center"},
+    "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area", "opening_hours", "phone", "website"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "pilates", "studio"], "name": "Gym / Fitness Center"},
     "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["asanas", "meditation", "modern yoga", "studio"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
     "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref", "wheelchair", "blind"], "moreFields": ["access_simple", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"},
     "leisure/fitness_station/balance_beam": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "balance_beam"}, "addTags": {"leisure": "fitness_station", "fitness_station": "balance_beam", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["balance", "exercise", "fitness", "gym", "trim trail"], "name": "Exercise Balance Beam"},
@@ -665,7 +668,7 @@
     "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"},
     "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"},
     "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"},
-    "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
+    "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
     "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "seamark/type", "website"], "geometry": ["area", "point", "vertex"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"},
     "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"},
@@ -705,7 +708,7 @@
     "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
     "leisure/sports_centre/climbing": {"icon": "temaki-abseiling", "geometry": ["point", "area"], "terms": ["abseiling", "artificial climbing wall", "belaying", "bouldering", "rock climbing facility", "indoor rock wall", "rappeling", "rock gym", "ropes"], "tags": {"leisure": "sports_centre", "sport": "climbing"}, "reference": {"key": "sport", "value": "climbing"}, "name": "Climbing Gym"},
     "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/stadium": {"icon": "maki-pitch", "fields": ["name", "operator", "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": ["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)"},
@@ -833,7 +836,7 @@
     "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"},
+    "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "baby_feeding", "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"},
     "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "searchable": false, "name": "Administrative Office"},
     "office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"},
     "office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "name": "Travel Agency", "searchable": false},
@@ -860,12 +863,13 @@
     "office/forestry": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "forestry"}, "terms": ["forest", "ranger"], "name": "Forestry Office"},
     "office/foundation": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "foundation"}, "terms": [], "name": "Foundation Office"},
     "office/government": {"icon": "maki-town-hall", "fields": ["name", "government", "{office}"], "geometry": ["point", "area"], "tags": {"office": "government"}, "terms": [], "name": "Government Office"},
+    "office/government/prosecutor": {"icon": "maki-suitcase", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["attorney general", "district attorney", "prosecution"], "tags": {"office": "government", "government": "prosecutor"}, "reference": {"key": "government", "value": "prosecutor"}, "name": "Public Prosecutor's Office"},
     "office/government/register_office": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["clerk", "marriage", "death", "birth", "certificate"], "tags": {"office": "government", "government": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office"},
     "office/government/tax": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["fiscal authorities", "revenue office", "tax office"], "tags": {"office": "government", "government": "tax"}, "reference": {"key": "government", "value": "tax"}, "name": "Tax and Revenue Office"},
     "office/guide": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "guide"}, "terms": ["dive guide", "mountain guide", "tour guide"], "name": "Tour Guide Office"},
     "office/insurance": {"icon": "temaki-briefcase_shield", "moreFields": ["brand", "{office}"], "geometry": ["point", "area"], "tags": {"office": "insurance"}, "terms": [], "name": "Insurance Office"},
     "office/it": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "it"}, "terms": ["computer", "information", "software", "technology"], "name": "Information Technology Office"},
-    "office/lawyer": {"icon": "fas-balance-scale", "geometry": ["point", "area"], "tags": {"office": "lawyer"}, "terms": [], "name": "Law Office"},
+    "office/lawyer": {"icon": "fas-balance-scale", "geometry": ["point", "area"], "tags": {"office": "lawyer"}, "terms": ["advocate", "attorney", "barrister", "counsellor", "counselor", "defender", "lawyer", "legal", "prosecutor"], "name": "Law Office"},
     "office/lawyer/notary": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "lawyer", "lawyer": "notary"}, "reference": {"key": "office", "value": "notary"}, "searchable": false, "name": "Notary Office"},
     "office/moving_company": {"icon": "fas-people-carry", "geometry": ["point", "area"], "tags": {"office": "moving_company"}, "terms": ["relocation"], "name": "Moving Company Office"},
     "office/newspaper": {"icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"office": "newspaper"}, "terms": [], "name": "Newspaper Office"},
@@ -966,7 +970,7 @@
     "public_transport/station_train": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["vertex", "point", "area"], "tags": {"public_transport": "station", "train": "yes"}, "addTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["public transit", "public transportation", "rail", "station", "terminal", "track", "train", "transit", "transportation"], "name": "Train Station"},
     "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Station"},
     "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Station / Terminal"},
-    "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
+    "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
     "public_transport/stop_area": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"},
     "public_transport/stop_position_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stopping Location"},
     "public_transport/stop_position_bus": {"icon": "maki-bus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "bus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stopping Location"},
@@ -998,7 +1002,7 @@
     "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["rail line", "railroad track", "train track"], "name": "Rail"},
     "railway/rail/highspeed": {"icon": "iD-railway-rail", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Rail"},
     "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"},
-    "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
+    "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level", "wheelchair"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
     "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
     "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
     "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
@@ -1045,6 +1049,7 @@
     "shop/car_parts": {"icon": "fas-car-battery", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"},
     "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
     "shop/car": {"icon": "maki-car", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car"}, "name": "Car Dealership"},
+    "shop/car/second_hand": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car", "second_hand": "only"}, "name": "Used Car Dealership"},
     "shop/caravan": {"icon": "temaki-rv_park", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "tags": {"shop": "caravan"}, "terms": ["auto", "camper", "recreational vehicle"], "name": "RV Dealership"},
     "shop/carpet": {"icon": "fas-tape", "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"},
     "shop/catalogue": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "catalogue"}, "name": "Catalog Shop"},
@@ -1053,6 +1058,7 @@
     "shop/chemist": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"},
     "shop/chocolate": {"icon": "maki-confectionery", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"},
     "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "terms": ["blouses", "boutique", "bras", "clothes", "dresses", "fashion", "pants", "shirts", "shorts", "skirts", "slacks", "socks", "suits", "underwear"], "name": "Clothing Store"},
+    "shop/clothes/second_hand": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "second_hand": "only"}, "terms": ["blouses", "clothes", "consignment", "dresses", "pants", "second hand", "shirts", "shorts", "skirts", "slacks", "suits", "used"], "name": "Secondhand Clothing Store"},
     "shop/clothes/underwear": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "underwear"}, "reference": {"key": "clothes", "value": "underwear"}, "terms": ["boutique", "bras", "brassieres", "briefs", "boxers", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothes", "undergarments", "underpants", "undies"], "name": "Underwear Store"},
     "shop/coffee": {"icon": "temaki-coffee", "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"},
     "shop/computer": {"icon": "fas-laptop", "geometry": ["point", "area"], "tags": {"shop": "computer"}, "terms": ["desktop", "laptop", "hardware", "operating system", "software"], "name": "Computer Store"},
@@ -1067,6 +1073,7 @@
     "shop/deli": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["lunch", "meat", "sandwich"], "tags": {"shop": "deli"}, "name": "Deli"},
     "shop/department_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store"}, "name": "Department Store"},
     "shop/doityourself": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "doityourself"}, "name": "DIY Store"},
+    "shop/doors": {"icon": "fas-door-open", "geometry": ["point", "area"], "tags": {"shop": "doors"}, "name": "Door Shop"},
     "shop/dry_cleaning": {"icon": "temaki-clothes_hanger", "geometry": ["point", "area"], "tags": {"shop": "dry_cleaning"}, "name": "Dry Cleaner"},
     "shop/e-cigarette": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "e-cigarette"}, "terms": ["electronic", "vape", "vaping", "vapor"], "name": "E-Cigarette Shop"},
     "shop/electrical": {"icon": "temaki-power", "geometry": ["point", "area"], "terms": ["cable", "electric", "fan", "LED", "lighting", "power", "wire"], "tags": {"shop": "electrical"}, "name": "Electrical Equipment Store"},
@@ -1103,7 +1110,7 @@
     "shop/hunting": {"icon": "temaki-binoculars", "geometry": ["point", "area"], "tags": {"shop": "hunting"}, "terms": ["arrows", "bows", "bullets", "crossbows", "rifles", "traps"], "name": "Hunting Shop"},
     "shop/interior_decoration": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "interior_decoration"}, "name": "Interior Decoration Store"},
     "shop/jewelry": {"icon": "maki-jewelry-store", "geometry": ["point", "area"], "terms": ["bracelet", "diamond", "earrings", "gem", "gold", "jeweler", "jewellery", "jeweller", "necklace", "pins", "ring", "silver"], "tags": {"shop": "jewelry"}, "name": "Jewelry Store"},
-    "shop/kiosk": {"icon": "maki-shop", "fields": ["{shop}", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"},
+    "shop/kiosk": {"icon": "fas-store", "fields": ["{shop}", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"},
     "shop/kitchen": {"icon": "temaki-kitchen_sink", "geometry": ["point", "area"], "tags": {"shop": "kitchen"}, "terms": ["cabinets", "countertops", "sinks"], "name": "Kitchen Design Store"},
     "shop/laundry": {"icon": "temaki-laundry", "fields": ["{shop}", "self_service"], "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"},
     "shop/laundry/self_service": {"icon": "temaki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry", "self_service": "yes"}, "terms": ["Coin Laundry", "Laundromat", "Coin Wash", "Launderette", "Washateria"], "name": "Self-Service Laundry"},
@@ -1206,7 +1213,9 @@
     "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "elevation"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"},
     "tourism/information/terminal": {"icon": "maki-information", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"},
     "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "terms": ["lodging", "motor hotel", "overnight accommodations"], "name": "Motel"},
-    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
+    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "museum", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
+    "tourism/museum/art": {"icon": "temaki-museum", "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum", "museum": "art"}, "reference": {"key": "museum", "value": "art"}, "name": "Art Museum"},
+    "tourism/museum/history": {"icon": "temaki-museum", "geometry": ["point", "area"], "terms": ["artifacts", "dioramas", "exhibits", "exhibitions", "foundation", "hall", "institution"], "tags": {"tourism": "museum", "museum": "history"}, "reference": {"key": "museum", "value": "history"}, "name": "History Museum"},
     "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
     "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
     "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
@@ -3367,7 +3376,7 @@
     "healthcare/blood_donation/Thai Red Cross Society": {"name": "Thai Red Cross Society", "icon": "maki-blood-bank", "imageURL": "https://graph.facebook.com/ThaiRedCross/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4922087", "healthcare": "blood_donation"}, "addTags": {"brand": "Thai Red Cross Society", "brand:wikidata": "Q4922087", "brand:wikipedia": "en:Thai Red Cross Society", "donation:compensation": "no", "healthcare": "blood_donation", "name": "Thai Red Cross Society", "short_name": "Thai Red Cross"}, "countryCodes": ["th"], "terms": [], "matchScore": 2, "suggestion": true},
     "healthcare/counselling/Jenny Craig": {"name": "Jenny Craig", "icon": "fas-comments", "imageURL": "https://graph.facebook.com/jennycraig/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6179221", "healthcare": "counselling"}, "addTags": {"brand": "Jenny Craig", "brand:wikidata": "Q6179221", "brand:wikipedia": "en:Jenny Craig, Inc.", "healthcare": "counselling", "healthcare:counselling": "dietitian", "healthcare:speciality": "weight_loss", "name": "Jenny Craig"}, "countryCodes": ["au", "ca", "nz", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "healthcare/counselling/WW Studio": {"name": "WW Studio", "icon": "fas-comments", "imageURL": "https://graph.facebook.com/WW/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1929466", "healthcare": "counselling"}, "addTags": {"alt_name": "Weight Watchers", "brand": "WW Studio", "brand:wikidata": "Q1929466", "brand:wikipedia": "en:WW International", "healthcare": "counselling", "healthcare:counselling": "dietitian", "healthcare:speciality": "weight_loss", "name": "WW Studio"}, "terms": ["ww"], "matchScore": 2, "suggestion": true},
-    "landuse/residential/Avalon": {"name": "Avalon", "icon": "maki-building", "imageURL": "https://pbs.twimg.com/profile_images/859879308940193792/us4WbKaN_bigger.jpg", "geometry": ["area"], "tags": {"brand:wikidata": "Q64665938", "landuse": "residential"}, "addTags": {"brand": "Avalon", "brand:wikidata": "Q64665938", "landuse": "residential", "name": "Avalon", "residential": "apartments"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "landuse/residential/Avalon": {"name": "Avalon", "icon": "maki-residential-community", "imageURL": "https://pbs.twimg.com/profile_images/859879308940193792/us4WbKaN_bigger.jpg", "geometry": ["area"], "tags": {"brand:wikidata": "Q64665938", "landuse": "residential"}, "addTags": {"brand": "Avalon", "brand:wikidata": "Q64665938", "landuse": "residential", "name": "Avalon", "residential": "apartments"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "leisure/bowling_alley/Strike Bowling Bar": {"name": "Strike Bowling Bar", "icon": "temaki-bowling", "imageURL": "https://graph.facebook.com/strikebowling/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7623769", "leisure": "bowling_alley"}, "addTags": {"brand": "Strike Bowling Bar", "brand:wikidata": "Q7623769", "brand:wikipedia": "en:Strike Bowling Bar", "leisure": "bowling_alley", "name": "Strike Bowling Bar"}, "countryCodes": ["au"], "terms": [], "matchScore": 2, "suggestion": true},
     "leisure/dog_park/Kamp K9": {"name": "Kamp K9", "icon": "maki-dog-park", "imageURL": "https://graph.facebook.com/KOAKampgrounds/picture?type=large", "geometry": ["area", "point"], "tags": {"brand:wikidata": "Q16988635", "leisure": "dog_park"}, "addTags": {"brand": "KOA", "brand:wikidata": "Q16988635", "brand:wikipedia": "en:Kampgrounds of America", "leisure": "dog_park", "name": "Kamp K9"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "leisure/escape_game/Escapology": {"name": "Escapology", "icon": "fas-puzzle-piece", "imageURL": "https://graph.facebook.com/EscapologySanDiego/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64137163", "leisure": "escape_game"}, "addTags": {"brand": "Escapology", "brand:wikidata": "Q64137163", "leisure": "escape_game", "name": "Escapology"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -4875,14 +4884,14 @@
     "shop/jewelry/Warren James": {"name": "Warren James", "icon": "maki-jewelry-store", "imageURL": "https://graph.facebook.com/warrenjamesjewellers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q19604616", "shop": "jewelry"}, "addTags": {"brand": "Warren James", "brand:wikidata": "Q19604616", "brand:wikipedia": "en:Warren James Jewellers", "name": "Warren James", "shop": "jewelry"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/jewelry/Zales": {"name": "Zales", "icon": "maki-jewelry-store", "imageURL": "https://graph.facebook.com/Zales/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8065305", "shop": "jewelry"}, "addTags": {"brand": "Zales", "brand:wikidata": "Q8065305", "brand:wikipedia": "en:Zale Corporation", "name": "Zales", "shop": "jewelry"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/jewelry/Адамас": {"name": "Адамас", "icon": "maki-jewelry-store", "imageURL": "https://graph.facebook.com/adamas.club/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62393709", "shop": "jewelry"}, "addTags": {"brand": "Адамас", "brand:en": "Adamas", "brand:ru": "Адамас", "brand:wikidata": "Q62393709", "name": "Адамас", "name:en": "Adamas", "name:ru": "Адамас", "shop": "jewelry"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kiosk/Lietuvos spauda": {"name": "Lietuvos spauda", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Lietuvos spauda", "brand:wikidata": "Q6514414", "brand:wikipedia": "lt:Lietuvos spauda", "name": "Lietuvos spauda", "shop": "kiosk"}, "countryCodes": ["lt"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kiosk/Narvesen": {"name": "Narvesen", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Narvesen", "brand:wikidata": "Q6514414", "brand:wikipedia": "en:Narvesen", "name": "Narvesen", "shop": "kiosk"}, "countryCodes": ["lt", "lv", "no"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kiosk/Pressbyrån": {"name": "Pressbyrån", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Pressbyran/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2489072", "shop": "kiosk"}, "addTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "countryCodes": ["se"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kiosk/R-Kioski": {"name": "R-Kioski", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/rkioski/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1571400", "shop": "kiosk"}, "addTags": {"brand": "R-Kioski", "brand:wikidata": "Q1571400", "brand:wikipedia": "en:R-kioski", "name": "R-Kioski", "shop": "kiosk"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kiosk/Ruch": {"name": "Ruch", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/ruch/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1260314", "shop": "kiosk"}, "addTags": {"brand": "Ruch", "brand:wikidata": "Q1260314", "brand:wikipedia": "pl:Ruch (przedsiębiorstwo)", "name": "Ruch", "shop": "kiosk"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kiosk/Tisak": {"name": "Tisak", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/tisakmedia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12643627", "shop": "kiosk"}, "addTags": {"brand": "Tisak", "brand:wikidata": "Q12643627", "brand:wikipedia": "hr:Tisak (tvrtka)", "name": "Tisak", "shop": "kiosk"}, "countryCodes": ["hr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kiosk/k kiosk": {"name": "k kiosk", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/kkiosk/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60381703", "shop": "kiosk"}, "addTags": {"brand": "k kiosk", "brand:wikidata": "Q60381703", "brand:wikipedia": "it:K Kiosk", "name": "k kiosk", "shop": "kiosk"}, "countryCodes": ["ch"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kiosk/キヨスク": {"name": "キヨスク", "icon": "maki-shop", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FKiosk%20logos.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1334796", "shop": "kiosk"}, "addTags": {"brand": "キヨスク", "brand:en": "KIOSK", "brand:ja": "キヨスク", "brand:wikidata": "Q1334796", "brand:wikipedia": "ja:キヨスク", "name": "キヨスク", "name:en": "KIOSK", "name:ja": "キヨスク", "shop": "kiosk"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kiosk/Lietuvos spauda": {"name": "Lietuvos spauda", "icon": "fas-store", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Lietuvos spauda", "brand:wikidata": "Q6514414", "brand:wikipedia": "lt:Lietuvos spauda", "name": "Lietuvos spauda", "shop": "kiosk"}, "countryCodes": ["lt"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kiosk/Narvesen": {"name": "Narvesen", "icon": "fas-store", "imageURL": "https://graph.facebook.com/narvesen.no/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6514414", "shop": "kiosk"}, "addTags": {"brand": "Narvesen", "brand:wikidata": "Q6514414", "brand:wikipedia": "en:Narvesen", "name": "Narvesen", "shop": "kiosk"}, "countryCodes": ["lt", "lv", "no"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kiosk/Pressbyrån": {"name": "Pressbyrån", "icon": "fas-store", "imageURL": "https://graph.facebook.com/Pressbyran/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2489072", "shop": "kiosk"}, "addTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "countryCodes": ["se"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kiosk/R-Kioski": {"name": "R-Kioski", "icon": "fas-store", "imageURL": "https://graph.facebook.com/rkioski/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1571400", "shop": "kiosk"}, "addTags": {"brand": "R-Kioski", "brand:wikidata": "Q1571400", "brand:wikipedia": "en:R-kioski", "name": "R-Kioski", "shop": "kiosk"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kiosk/Ruch": {"name": "Ruch", "icon": "fas-store", "imageURL": "https://graph.facebook.com/ruch/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1260314", "shop": "kiosk"}, "addTags": {"brand": "Ruch", "brand:wikidata": "Q1260314", "brand:wikipedia": "pl:Ruch (przedsiębiorstwo)", "name": "Ruch", "shop": "kiosk"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kiosk/Tisak": {"name": "Tisak", "icon": "fas-store", "imageURL": "https://graph.facebook.com/tisakmedia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12643627", "shop": "kiosk"}, "addTags": {"brand": "Tisak", "brand:wikidata": "Q12643627", "brand:wikipedia": "hr:Tisak (tvrtka)", "name": "Tisak", "shop": "kiosk"}, "countryCodes": ["hr"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kiosk/k kiosk": {"name": "k kiosk", "icon": "fas-store", "imageURL": "https://graph.facebook.com/kkiosk/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60381703", "shop": "kiosk"}, "addTags": {"brand": "k kiosk", "brand:wikidata": "Q60381703", "brand:wikipedia": "it:K Kiosk", "name": "k kiosk", "shop": "kiosk"}, "countryCodes": ["ch"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kiosk/キヨスク": {"name": "キヨスク", "icon": "fas-store", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FKiosk%20logos.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1334796", "shop": "kiosk"}, "addTags": {"brand": "キヨスク", "brand:en": "KIOSK", "brand:ja": "キヨスク", "brand:wikidata": "Q1334796", "brand:wikipedia": "ja:キヨスク", "name": "キヨスク", "name:en": "KIOSK", "name:ja": "キヨスク", "shop": "kiosk"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/kitchen/Cuisinella": {"name": "Cuisinella", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/CuisinellaFR/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3007012", "shop": "kitchen"}, "addTags": {"brand": "Cuisinella", "brand:wikidata": "Q3007012", "brand:wikipedia": "fr:Cuisinella", "name": "Cuisinella", "shop": "kitchen"}, "countryCodes": ["fr", "tn"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/kitchen/Ixina": {"name": "Ixina", "icon": "temaki-kitchen_sink", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FIxina.png&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3156424", "shop": "kitchen"}, "addTags": {"brand": "Ixina", "brand:wikidata": "Q3156424", "brand:wikipedia": "fr:Ixina", "name": "Ixina", "shop": "kitchen"}, "countryCodes": ["ae", "au", "be", "bf", "bh", "bj", "ca", "ci", "cm", "cn", "cz", "dz", "ee", "eg", "fr", "gh", "hr", "ke", "kw", "lu", "ly", "ma", "mu", "nl", "pl", "qa", "ro", "ru", "sa", "se", "sn", "tg", "th", "tn", "vn"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/kitchen/Magnet": {"name": "Magnet", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/MagnetKitchens/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6731427", "shop": "kitchen"}, "addTags": {"brand": "Magnet", "brand:wikidata": "Q6731427", "brand:wikipedia": "en:Magnet Kitchens", "name": "Magnet", "shop": "kitchen"}, "countryCodes": ["gb"], "terms": ["magnet kitchens"], "matchScore": 2, "suggestion": true},

data/presets/presets/aeroway/terminal.json

@@ -11,11 +11,12 @@
     "fields": [
         "name",
         "operator",
-        "building_area"
+        "building_area",
+        "wheelchair",
+        "baby_feeding"
     ],
     "moreFields": [
-        "smoking",
-        "wheelchair"
+        "smoking"
     ],
     "tags": {
         "aeroway": "terminal"

data/presets/presets/amenity/bar.json

@@ -19,6 +19,7 @@
         "level",
         "microbrewery",
         "opening_hours",
+        "operator",
         "payment_multi",
         "phone",
         "ref/vatin",

data/presets/presets/amenity/biergarten.json

@@ -3,12 +3,14 @@
     "fields": [
         "name",
         "address",
-        "building",
+        "opening_hours",
         "outdoor_seating",
         "brewery"
     ],
     "moreFields": [
-        "{amenity/bar}"
+        "{amenity/bar}",
+        "building_area",
+        "cuisine"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/casino.json

@@ -6,6 +6,7 @@
         "address",
         "building_area",
         "opening_hours",
+        "gambling",
         "smoking"
     ],
     "moreFields": [

data/presets/presets/amenity/childcare.json

@@ -9,6 +9,7 @@
         "opening_hours"
     ],
     "moreFields": [
+        "baby_feeding",
         "email",
         "fax",
         "gnis/feature_id",

data/presets/presets/amenity/community_centre.json

@@ -8,6 +8,7 @@
     ],
     "moreFields": [
         "air_conditioning",
+        "baby_feeding",
         "email",
         "fax",
         "gnis/feature_id",

data/presets/presets/amenity/grave_yard.json

@@ -18,5 +18,16 @@
     "tags": {
         "amenity": "grave_yard"
     },
+    "terms": [
+        "burial ground",
+        "cemetary",
+        "cemetery",
+        "churchyard",
+        "columbarium",
+        "grave yard",
+        "graveyard",
+        "mausoleum",
+        "tomb"
+    ],
     "name": "Graveyard"
 }

data/presets/presets/amenity/library.json

@@ -14,6 +14,7 @@
     "moreFields": [
         "access_simple",
         "air_conditioning",
+        "baby_feeding",
         "email",
         "fax",
         "gnis/feature_id",

data/presets/presets/amenity/pharmacy.json

@@ -5,8 +5,9 @@
         "operator",
         "address",
         "building_area",
-        "drive_through",
-        "dispensing"
+        "opening_hours",
+        "dispensing",
+        "drive_through"
     ],
     "moreFields": [
         "brand",
@@ -14,7 +15,6 @@
         "fax",
         "gnis/feature_id",
         "level",
-        "opening_hours",
         "payment_multi",
         "phone",
         "website",

data/presets/presets/amenity/place_of_worship.json

@@ -10,6 +10,7 @@
     ],
     "moreFields": [
         "air_conditioning",
+        "baby_feeding",
         "email",
         "fax",
         "gnis/feature_id",

data/presets/presets/amenity/pub.json

@@ -10,6 +10,7 @@
     ],
     "moreFields": [
         "air_conditioning",
+        "cuisine",
         "diet_multi",
         "email",
         "fax",

data/presets/presets/amenity/restaurant.json

@@ -6,7 +6,8 @@
         "address",
         "building_area",
         "opening_hours",
-        "phone"
+        "phone",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
@@ -32,7 +33,6 @@
         "smoking",
         "stars",
         "takeaway",
-        "website",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/amenity/social_centre.json

@@ -10,6 +10,7 @@
     ],
     "moreFields": [
         "air_conditioning",
+        "baby_feeding",
         "email",
         "fax",
         "gnis/feature_id",

data/presets/presets/amenity/social_facility.json

@@ -10,6 +10,7 @@
         "social_facility_for"
     ],
     "moreFields": [
+        "baby_feeding",
         "email",
         "fax",
         "gnis/feature_id",

data/presets/presets/amenity/townhall.json

@@ -8,6 +8,7 @@
         "building_area"
     ],
     "moreFields": [
+        "baby_feeding",
         "email",
         "fax",
         "gnis/feature_id",

data/presets/presets/barrier/gate.json

@@ -2,7 +2,16 @@
     "icon": "temaki-gate",
     "fields": [
         "access",
-        "opening_hours"
+        "wheelchair",
+        "opening_hours",
+        "height",
+        "material"
+    ],
+    "moreFields": [
+        "colour",
+        "manufacturer",
+        "operator",
+        "ref"
     ],
     "geometry": [
         "vertex",

data/presets/presets/barrier/lift_gate.json

@@ -1,7 +1,8 @@
 {
     "icon": "temaki-lift_gate",
     "fields": [
-        "access"
+        "access",
+        "opening_hours"
     ],
     "geometry": [
         "vertex",

data/presets/presets/barrier/swing_gate.json

@@ -0,0 +1,16 @@
+{
+    "icon": "temaki-gate",
+    "fields": [
+        "{barrier/gate}"
+    ],
+    "moreFields": [
+        "{barrier/gate}"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "barrier": "swing_gate"
+    },
+    "name": "Swing Gate"
+}

data/presets/presets/building/cathedral.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-place-of-worship",
+    "icon": "fas-church",
     "geometry": [
         "area"
     ],

data/presets/presets/building/church.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-place-of-worship",
+    "icon": "fas-church",
     "geometry": [
         "area"
     ],

data/presets/presets/building/college.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-school",
     "moreFields": [
         "{building}",
         "polling_station"

data/presets/presets/building/hospital.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-hospital-alt",
     "geometry": [
         "area"
     ],

data/presets/presets/building/hotel.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-hotel",
     "fields": [
         "{building}",
         "smoking"

data/presets/presets/building/kindergarten.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-school",
     "geometry": [
         "area"
     ],

data/presets/presets/building/mosque.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-place-of-worship",
+    "icon": "fas-mosque",
     "geometry": [
         "area"
     ],

data/presets/presets/building/school.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-school",
     "moreFields": [
         "{building}",
         "polling_station"

data/presets/presets/building/university.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-school",
     "moreFields": [
         "{building}",
         "polling_station"

data/presets/presets/demolished/_building.json

@@ -1,4 +1,5 @@
 {
+    "icon": "fas-house-damage",
     "fields": [
         "name",
         "address"

data/presets/presets/entrance.json

@@ -1,23 +1,25 @@
 {
     "icon": "maki-entrance-alt1",
+    "fields": [
+        "ref",
+        "entrance",
+        "door",
+        "access_simple",
+        "wheelchair",
+        "level",
+        "address"
+    ],
     "geometry": [
         "vertex"
     ],
+    "tags": {
+        "entrance": "*"
+    },
     "terms": [
         "entrance",
         "exit",
         "door"
     ],
-    "tags": {
-        "entrance": "*"
-    },
-    "fields": [
-        "entrance",
-        "door",
-        "access_simple",
-        "level",
-        "address"
-    ],
     "matchScore": 0.8,
     "name": "Entrance/Exit"
 }

data/presets/presets/entrance/emergency.json

@@ -0,0 +1,21 @@
+{
+    "icon": "maki-entrance-alt1",
+    "fields": [
+        "ref",
+        "door",
+        "access_simple",
+        "level"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "entrance": "emergency"
+    },
+    "terms": [
+        "fire exit",
+        "door"
+    ],
+    "matchScore": 0.8,
+    "name": "Emergency Exit"
+}

data/presets/presets/historic.json

@@ -16,5 +16,6 @@
     "tags": {
         "historic": "*"
     },
+    "matchScore": 0.5,
     "name": "Historic Site"
 }

data/presets/presets/historic/building.json

@@ -0,0 +1,27 @@
+{
+    "icon": "maki-home",
+    "fields": [
+        "{building}",
+        "start_date"
+    ],
+    "moreFields": [
+        "{building}",
+        "access_simple"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "historic": "building"
+    },
+    "addTags": {
+        "historic": "building",
+        "building": "*"
+    },
+    "reference": {
+        "key": "historic",
+        "value": "building"
+    },
+    "matchScore": 0.5,
+    "name": "Historic Building"
+}

data/presets/presets/landuse/_churchyard.json

@@ -1,16 +1,10 @@
 {
     "icon": "maki-religious-christian",
     "fields": [
-        "name",
-        "religion",
-        "denomination"
+        "{landuse/religious}"
     ],
     "moreFields": [
-        "address",
-        "email",
-        "fax",
-        "phone",
-        "website"
+        "{landuse/religious}"
     ],
     "geometry": [
         "area"
@@ -19,5 +13,6 @@
         "landuse": "churchyard"
     },
     "terms": [],
+    "searchable": false,
     "name": "Churchyard"
 }

data/presets/presets/landuse/cemetery.json

@@ -18,6 +18,16 @@
     "tags": {
         "landuse": "cemetery"
     },
-    "terms": [],
+    "terms": [
+        "burial ground",
+        "cemetary",
+        "cemetery",
+        "churchyard",
+        "columbarium",
+        "grave yard",
+        "graveyard",
+        "mausoleum",
+        "tomb"
+    ],
     "name": "Cemetery"
 }

data/presets/presets/landuse/religious.json

@@ -18,6 +18,20 @@
     "tags": {
         "landuse": "religious"
     },
-    "terms": [],
+    "terms": [
+        "christian",
+        "churchyard",
+        "hindu",
+        "jewish",
+        "mosque",
+        "muslim",
+        "place of worship",
+        "shinto",
+        "sikh",
+        "taoist",
+        "temple",
+        "shrine",
+        "synagogue"
+    ],
     "name": "Religious Area"
 }

data/presets/presets/landuse/residential.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "maki-residential-community",
     "fields": [
         "name",
         "residential"

data/presets/presets/landuse/residential/apartments.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "maki-residential-community",
     "fields": [
         "name",
         "operator",

data/presets/presets/leisure/amusement_arcade.json

@@ -11,6 +11,9 @@
         "email",
         "fax",
         "gnis/feature_id",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid",
         "level",
         "max_age",
         "min_age",

data/presets/presets/leisure/bowling_alley.json

@@ -11,6 +11,9 @@
         "email",
         "fax",
         "gnis/feature_id",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid",
         "level",
         "min_age",
         "opening_hours",

data/presets/presets/leisure/dog_park.json

@@ -1,22 +1,31 @@
 {
     "icon": "maki-dog-park",
     "fields": [
-        "name"
+        "name",
+        "operator",
+        "operator/type",
+        "address",
+        "access_simple",
+        "website"
     ],
     "moreFields": [
+        "dog",
         "email",
         "fax",
         "gnis/feature_id",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid",
         "phone",
-        "website"
+        "ref"
     ],
     "geometry": [
         "area",
         "point"
     ],
-    "terms": [],
     "tags": {
         "leisure": "dog_park"
     },
+    "terms": [],
     "name": "Dog Park"
 }

data/presets/presets/leisure/fitness_centre.json

@@ -4,7 +4,10 @@
         "name",
         "sport",
         "address",
-        "building_area"
+        "building_area",
+        "opening_hours",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "brand",
@@ -13,10 +16,10 @@
         "fax",
         "fee",
         "gnis/feature_id",
-        "opening_hours",
-        "payment_multi",
-        "phone",
-        "website"
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid",
+        "payment_multi"
     ],
     "geometry": [
         "point",

data/presets/presets/leisure/ice_rink.json

@@ -12,6 +12,9 @@
         "email",
         "fax",
         "gnis/feature_id",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid",
         "level",
         "opening_hours",
         "payment_multi",

data/presets/presets/leisure/stadium.json

@@ -2,6 +2,7 @@
     "icon": "maki-pitch",
     "fields": [
         "name",
+        "operator",
         "sport",
         "address"
     ],

data/presets/presets/office.json

@@ -9,6 +9,7 @@
     ],
     "moreFields": [
         "air_conditioning",
+        "baby_feeding",
         "building/levels_building",
         "email",
         "fax",

data/presets/presets/office/government/prosecutor.json

@@ -0,0 +1,25 @@
+{
+    "icon": "maki-suitcase",
+    "fields": [
+        "{office}",
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "attorney general",
+        "district attorney",
+        "prosecution"
+    ],
+    "tags": {
+        "office": "government",
+        "government": "prosecutor"
+    },
+    "reference": {
+        "key": "government",
+        "value": "prosecutor"
+    },
+    "name": "Public Prosecutor's Office"
+}

data/presets/presets/office/lawyer.json

@@ -7,6 +7,16 @@
     "tags": {
         "office": "lawyer"
     },
-    "terms": [],
+    "terms": [
+        "advocate",
+        "attorney",
+        "barrister",
+        "counsellor",
+        "counselor",
+        "defender",
+        "lawyer",
+        "legal",
+        "prosecutor"
+    ],
     "name": "Law Office"
 }

data/presets/presets/public_transport/station.json

@@ -10,6 +10,7 @@
     ],
     "moreFields": [
         "air_conditioning",
+        "baby_feeding",
         "email",
         "fax",
         "gnis/feature_id",

data/presets/presets/railway/subway_entrance.json

@@ -6,7 +6,8 @@
     ],
     "fields": [
         "name",
-        "level"
+        "level",
+        "wheelchair"
     ],
     "tags": {
         "railway": "subway_entrance"

data/presets/presets/shop/car/second_hand.json

@@ -0,0 +1,16 @@
+{
+    "icon": "maki-car",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "automobile",
+        "automotive"
+    ],
+    "tags": {
+        "shop": "car",
+        "second_hand": "only"
+    },
+    "name": "Used Car Dealership"
+}

data/presets/presets/shop/clothes/second_hand.json

@@ -0,0 +1,26 @@
+{
+    "icon": "maki-clothing-store",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "clothes",
+        "second_hand": "only"
+    },
+    "terms": [
+        "blouses",
+        "clothes",
+        "consignment",
+        "dresses",
+        "pants",
+        "second hand",
+        "shirts",
+        "shorts",
+        "skirts",
+        "slacks",
+        "suits",
+        "used"
+    ],
+    "name": "Secondhand Clothing Store"
+}

data/presets/presets/shop/doors.json

@@ -0,0 +1,11 @@
+{
+    "icon": "fas-door-open",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "doors"
+    },
+    "name": "Door Shop"
+}

data/presets/presets/shop/kiosk.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-store",
     "fields": [
         "{shop}",
         "levels"

data/presets/presets/tourism/museum.json

@@ -4,6 +4,7 @@
         "name",
         "operator",
         "operator/type",
+        "museum",
         "address",
         "building_area",
         "opening_hours"

data/presets/presets/tourism/museum/art.json

@@ -0,0 +1,27 @@
+{
+    "icon": "temaki-museum",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "art*",
+        "exhibit*",
+        "gallery",
+        "foundation",
+        "hall",
+        "institution",
+        "paint*",
+        "photo*",
+        "sculpt*"
+    ],
+    "tags": {
+        "tourism": "museum",
+        "museum": "art"
+    },
+    "reference": {
+        "key": "museum",
+        "value": "art"
+    },
+    "name": "Art Museum"
+}

data/presets/presets/tourism/museum/history.json

@@ -0,0 +1,25 @@
+{
+    "icon": "temaki-museum",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "artifacts",
+        "dioramas",
+        "exhibits",
+        "exhibitions",
+        "foundation",
+        "hall",
+        "institution"
+    ],
+    "tags": {
+        "tourism": "museum",
+        "museum": "history"
+    },
+    "reference": {
+        "key": "museum",
+        "value": "history"
+    },
+    "name": "History Museum"
+}

data/taginfo.json

@@ -315,6 +315,7 @@
     {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"},
     {"key": "barrier", "value": "sally_port", "description": "🄿 Sally Port", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dungeon.svg"},
     {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
+    {"key": "barrier", "value": "swing_gate", "description": "🄿 Swing Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/gate.svg"},
     {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/turnstile.svg"},
     {"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"},
@@ -332,11 +333,11 @@
     {"key": "building", "value": "bungalow", "description": "🄿 Bungalow", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "cabin", "description": "🄿 Cabin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cabin.svg"},
     {"key": "building", "value": "carport", "description": "🄿 Carport", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
-    {"key": "building", "value": "cathedral", "description": "🄿 Cathedral Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
+    {"key": "building", "value": "cathedral", "description": "🄿 Cathedral Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-church.svg"},
     {"key": "building", "value": "chapel", "description": "🄿 Chapel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
-    {"key": "building", "value": "church", "description": "🄿 Church Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
+    {"key": "building", "value": "church", "description": "🄿 Church Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-church.svg"},
     {"key": "building", "value": "civic", "description": "🄿 Civic Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "college", "description": "🄿 College Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "building", "value": "college", "description": "🄿 College Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"},
     {"key": "building", "value": "commercial", "description": "🄿 Commercial Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "building", "value": "construction", "description": "🄿 Building Under Construction", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "detached", "description": "🄿 Detached House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
@@ -348,21 +349,21 @@
     {"key": "building", "value": "grandstand", "description": "🄿 Grandstand", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "greenhouse", "description": "🄿 Greenhouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"},
     {"key": "building", "value": "hangar", "description": "🄿 Hangar Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
-    {"key": "building", "value": "hospital", "description": "🄿 Hospital Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "hotel", "description": "🄿 Hotel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "building", "value": "hospital", "description": "🄿 Hospital Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hospital-alt.svg"},
+    {"key": "building", "value": "hotel", "description": "🄿 Hotel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hotel.svg"},
     {"key": "building", "value": "house", "description": "🄿 House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "houseboat", "description": "🄿 Houseboat", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "hut", "description": "🄿 Hut", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "industrial", "description": "🄿 Industrial Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"},
-    {"key": "building", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "mosque", "description": "🄿 Mosque Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
+    {"key": "building", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"},
+    {"key": "building", "value": "mosque", "description": "🄿 Mosque Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-mosque.svg"},
     {"key": "building", "value": "pavilion", "description": "🄿 Pavilion Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "public", "description": "🄿 Public Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "residential", "description": "🄿 Residential Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/residential-community-15.svg"},
     {"key": "building", "value": "retail", "description": "🄿 Retail Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/commercial-15.svg"},
     {"key": "building", "value": "roof", "description": "🄿 Roof", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
     {"key": "building", "value": "ruins", "description": "🄿 Building Ruins", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ruins.svg"},
-    {"key": "building", "value": "school", "description": "🄿 School Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "building", "value": "school", "description": "🄿 School Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"},
     {"key": "building", "value": "semidetached_house", "description": "🄿 Semi-Detached House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "service", "description": "🄿 Service Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "shed", "description": "🄿 Shed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
@@ -372,7 +373,7 @@
     {"key": "building", "value": "temple", "description": "🄿 Temple Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
     {"key": "building", "value": "terrace", "description": "🄿 Row Houses", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "transportation", "description": "🄿 Transportation Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "university", "description": "🄿 University Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "building", "value": "university", "description": "🄿 University Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"},
     {"key": "building", "value": "warehouse", "description": "🄿 Warehouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/warehouse-15.svg"},
     {"key": "club", "description": "🄿 Club, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-handshake.svg"},
     {"key": "club", "value": "sport", "description": "🄿 Sports Club", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
@@ -430,7 +431,7 @@
     {"key": "craft", "value": "window_construction", "description": "🄿 Window Construction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/window.svg"},
     {"key": "craft", "value": "winery", "description": "🄿 Winery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/alcohol-shop-15.svg"},
     {"key": "cycleway", "value": "asl", "description": "🄿 Advanced Stop Line", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
-    {"key": "demolished:building", "description": "🄿 Recently Demolished Building (unsearchable)", "object_types": ["area"]},
+    {"key": "demolished:building", "description": "🄿 Recently Demolished Building (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-house-damage.svg"},
     {"key": "disused:railway", "description": "🄿 Disused Railway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
     {"key": "emergency", "value": "designated", "description": "🄿 Emergency Access Designated (unsearchable)", "object_types": ["way"]},
     {"key": "emergency", "value": "destination", "description": "🄿 Emergency Access Destination (unsearchable)", "object_types": ["way"]},
@@ -451,6 +452,7 @@
     {"key": "emergency", "value": "siren", "description": "🄿 Siren", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-volume-up.svg"},
     {"key": "emergency", "value": "water_tank", "description": "🄿 Emergency Water Tank", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "entrance", "description": "🄿 Entrance/Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
+    {"key": "entrance", "value": "emergency", "description": "🄿 Emergency Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"},
     {"key": "golf", "value": "bunker", "description": "🄿 Sand Trap", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
     {"key": "golf", "value": "cartpath", "description": "🄿 Golf Cartpath", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/golf_cart.svg"},
@@ -546,6 +548,7 @@
     {"key": "historic", "description": "🄿 Historic Site, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ruins.svg"},
     {"key": "historic", "value": "archaeological_site", "description": "🄿 Archaeological Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ruins.svg"},
     {"key": "historic", "value": "boundary_stone", "description": "🄿 Boundary Stone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/milestone.svg"},
+    {"key": "historic", "value": "building", "description": "🄿 Historic Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "historic", "value": "castle", "description": "🄿 Castle", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"},
     {"key": "castle_type", "value": "fortress", "description": "🄿 Historic Fortress", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"},
     {"key": "castle_type", "value": "palace", "description": "🄿 Palace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-crown.svg"},
@@ -571,6 +574,7 @@
     {"key": "internet_access", "value": "wlan", "description": "🄿 Wi-Fi Hotspot, 🄵 Internet Access", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-wifi.svg"},
     {"key": "junction", "value": "yes", "description": "🄿 Junction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junction.svg"},
     {"key": "landuse", "value": "basin", "description": "🄿 Basin (unsearchable), 🄳 ➜ natural=water + water=basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
+    {"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},
     {"key": "landuse", "value": "farm", "description": "🄿 Farmland (unsearchable), 🄳 ➜ landuse=farmland", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"},
     {"key": "landuse", "value": "pond", "description": "🄿 Pond (unsearchable), 🄳 ➜ natural=water + water=pond", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "landuse", "value": "reservoir", "description": "🄿 Reservoir (unsearchable), 🄳 ➜ natural=water + water=reservoir", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
@@ -578,7 +582,6 @@
     {"key": "landuse", "value": "aquaculture", "description": "🄿 Aquaculture", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aquarium-15.svg"},
     {"key": "landuse", "value": "brownfield", "description": "🄿 Brownfield", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bulldozer.svg"},
     {"key": "landuse", "value": "cemetery", "description": "🄿 Cemetery", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"},
-    {"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},
     {"key": "landuse", "value": "commercial", "description": "🄿 Commercial Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "landuse", "value": "construction", "description": "🄿 Construction Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bulldozer.svg"},
     {"key": "landuse", "value": "farmland", "description": "🄿 Farmland", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tractor.svg"},
@@ -609,8 +612,8 @@
     {"key": "landuse", "value": "railway", "description": "🄿 Railway Corridor", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"},
     {"key": "landuse", "value": "recreation_ground", "description": "🄿 Recreation Ground", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "landuse", "value": "religious", "description": "🄿 Religious Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
-    {"key": "landuse", "value": "residential", "description": "🄿 Residential Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "residential", "value": "apartments", "description": "🄿 Apartment Complex", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "landuse", "value": "residential", "description": "🄿 Residential Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/residential-community-15.svg"},
+    {"key": "residential", "value": "apartments", "description": "🄿 Apartment Complex", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/residential-community-15.svg"},
     {"key": "landuse", "value": "retail", "description": "🄿 Retail Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/commercial-15.svg"},
     {"key": "landuse", "value": "vineyard", "description": "🄿 Vineyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/grapes.svg"},
     {"key": "landuse", "value": "winter_sports", "description": "🄿 Winter Sports Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"},
@@ -835,6 +838,7 @@
     {"key": "office", "value": "forestry", "description": "🄿 Forestry Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "foundation", "description": "🄿 Foundation Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "government", "description": "🄿 Government Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
+    {"key": "government", "value": "prosecutor", "description": "🄿 Public Prosecutor's Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "government", "value": "register_office", "description": "🄿 Register Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
     {"key": "government", "value": "tax", "description": "🄿 Tax and Revenue Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
     {"key": "office", "value": "guide", "description": "🄿 Tour Guide Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
@@ -989,6 +993,7 @@
     {"key": "shop", "value": "car_parts", "description": "🄿 Car Parts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-car-battery.svg"},
     {"key": "shop", "value": "car_repair", "description": "🄿 Car Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-repair-15.svg"},
     {"key": "shop", "value": "car", "description": "🄿 Car Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
+    {"key": "second_hand", "value": "only", "description": "🄿 Used Car Dealership, 🄿 Secondhand Clothing Store, 🄵 Sells Used", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "shop", "value": "caravan", "description": "🄿 RV Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rv_park.svg"},
     {"key": "shop", "value": "carpet", "description": "🄿 Carpet Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tape.svg"},
     {"key": "shop", "value": "catalogue", "description": "🄿 Catalog Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
@@ -1011,6 +1016,7 @@
     {"key": "shop", "value": "deli", "description": "🄿 Deli", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"},
     {"key": "shop", "value": "department_store", "description": "🄿 Department Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "doityourself", "description": "🄿 DIY Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
+    {"key": "shop", "value": "doors", "description": "🄿 Door Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-door-open.svg"},
     {"key": "shop", "value": "dry_cleaning", "description": "🄿 Dry Cleaner", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/clothes_hanger.svg"},
     {"key": "shop", "value": "e-cigarette", "description": "🄿 E-Cigarette Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "electrical", "description": "🄿 Electrical Equipment Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power.svg"},
@@ -1046,7 +1052,7 @@
     {"key": "shop", "value": "hunting", "description": "🄿 Hunting Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/binoculars.svg"},
     {"key": "shop", "value": "interior_decoration", "description": "🄿 Interior Decoration Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "jewelry", "description": "🄿 Jewelry Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/jewelry-store-15.svg"},
-    {"key": "shop", "value": "kiosk", "description": "🄿 Kiosk", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "kiosk", "description": "🄿 Kiosk", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-store.svg"},
     {"key": "shop", "value": "kitchen", "description": "🄿 Kitchen Design Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/kitchen_sink.svg"},
     {"key": "shop", "value": "laundry", "description": "🄿 Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/laundry.svg"},
     {"key": "self_service", "value": "yes", "description": "🄿 Self-Service Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/laundry.svg"},
@@ -1150,6 +1156,8 @@
     {"key": "information", "value": "terminal", "description": "🄿 Information Terminal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"},
     {"key": "tourism", "value": "motel", "description": "🄿 Motel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"},
     {"key": "tourism", "value": "museum", "description": "🄿 Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"},
+    {"key": "museum", "value": "art", "description": "🄿 Art Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"},
+    {"key": "museum", "value": "history", "description": "🄿 History Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"},
     {"key": "tourism", "value": "picnic_site", "description": "🄿 Picnic Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/picnic-site-15.svg"},
     {"key": "tourism", "value": "theme_park", "description": "🄿 Theme Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"},
     {"key": "tourism", "value": "trail_riding_station", "description": "🄿 Trail Riding Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"},
@@ -1308,6 +1316,9 @@
     {"key": "artist_name", "description": "🄵 Artist"},
     {"key": "artwork_type", "description": "🄵 Type"},
     {"key": "atm", "description": "🄵 ATM"},
+    {"key": "baby_feeding", "value": "room", "description": "🄵 Baby Nursing Area"},
+    {"key": "baby_feeding", "value": "yes", "description": "🄵 Baby Nursing Area"},
+    {"key": "baby_feeding", "value": "no", "description": "🄵 Baby Nursing Area"},
     {"key": "baby", "description": "🄵 Baby Seat"},
     {"key": "backcountry", "description": "🄵 Backcountry"},
     {"key": "backrest", "description": "🄵 Backrest"},
@@ -1484,6 +1495,7 @@
     {"key": "from", "description": "🄵 From"},
     {"key": "fuel:", "description": "🄵 Fuel Types"},
     {"key": "fuel", "description": "🄵 Fuel"},
+    {"key": "gambling", "description": "🄵 Games"},
     {"key": "gauge", "description": "🄵 Gauge"},
     {"key": "male", "description": "🄵 Gender"},
     {"key": "female", "description": "🄵 Gender"},
@@ -1599,6 +1611,7 @@
     {"key": "mtb:scale:uphill", "value": "3", "description": "🄵 Mountain Biking Uphill Difficulty"},
     {"key": "mtb:scale:uphill", "value": "4", "description": "🄵 Mountain Biking Uphill Difficulty"},
     {"key": "mtb:scale:uphill", "value": "5", "description": "🄵 Mountain Biking Uphill Difficulty"},
+    {"key": "museum", "description": "🄵 Type"},
     {"key": "name", "description": "🄵 Name"},
     {"key": "network", "value": "lcn", "description": "🄵 Network Class"},
     {"key": "network", "value": "rcn", "description": "🄵 Network Class"},
@@ -1761,7 +1774,6 @@
     {"key": "seats", "description": "🄵 Seats"},
     {"key": "second_hand", "value": "yes", "description": "🄵 Sells Used"},
     {"key": "second_hand", "value": "no", "description": "🄵 Sells Used"},
-    {"key": "second_hand", "value": "only", "description": "🄵 Sells Used"},
     {"key": "segregated", "description": "🄵 Bicycle-Pedestrian Separation"},
     {"key": "self_service", "description": "🄵 Self-Service"},
     {"key": "service", "value": "spur", "description": "🄵 Service Type"},
@@ -2001,6 +2013,11 @@
     {"key": "embankment", "value": "1", "description": "🄳 ➜ embankment=yes"},
     {"key": "embankment", "value": "false", "description": "🄳 ➜ embankment=no"},
     {"key": "embankment", "value": "true", "description": "🄳 ➜ embankment=yes"},
+    {"key": "entrance", "value": "emergency_exit", "description": "🄳 ➜ entrance=emergency"},
+    {"key": "entrance", "value": "fire_exit", "description": "🄳 ➜ entrance=emergency"},
+    {"key": "entrance", "value": "loading_dock", "description": "🄳 ➜ amenity=loading_dock"},
+    {"key": "entrance", "value": "main_entrance", "description": "🄳 ➜ entrance=main"},
+    {"key": "entrance", "value": "private", "description": "🄳 ➜ entrance=yes + access=private"},
     {"key": "escalator", "description": "🄳 ➜ highway=steps + conveying=*"},
     {"key": "fee", "value": "0", "description": "🄳 ➜ fee=no"},
     {"key": "fee", "value": "free", "description": "🄳 ➜ fee=no"},
@@ -2017,6 +2034,7 @@
     {"key": "footway", "value": "none", "description": "🄳 ➜ sidewalk=no"},
     {"key": "footway", "value": "right", "description": "🄳 ➜ sidewalk=right"},
     {"key": "footway", "value": "separate", "description": "🄳 ➜ sidewalk=separate"},
+    {"key": "gambling", "value": "slot_machine", "description": "🄳 ➜ gambling=slot_machines"},
     {"key": "generator:source", "value": "photovoltaic", "description": "🄳 ➜ generator:source=solar + generator:method=photovoltaic"},
     {"key": "golf", "value": "faiway", "description": "🄳 ➜ golf=fairway + landuse=grass"},
     {"key": "golf", "value": "putting_green", "description": "🄳 ➜ golf=green + landuse=grass"},
@@ -2074,6 +2092,10 @@
     {"key": "men", "description": "🄳 ➜ male=*"},
     {"key": "minage", "description": "🄳 ➜ min_age=*"},
     {"key": "mining_resource", "description": "🄳 ➜ resource=*"},
+    {"key": "museum_type", "value": "art", "description": "🄳 ➜ museum=art"},
+    {"key": "museum_type", "value": "history", "description": "🄳 ➜ museum=history"},
+    {"key": "museum_type", "value": "private", "description": "🄳 ➜ operator:type=private"},
+    {"key": "museum_type", "value": "public", "description": "🄳 ➜ operator:type=public"},
     {"key": "natural", "value": "marsh", "description": "🄳 ➜ natural=wetland + wetland=marsh"},
     {"key": "natural", "value": "waterfall", "description": "🄳 ➜ waterway=waterfall"},
     {"key": "NOTE", "description": "🄳 ➜ note=*"},
@@ -2085,6 +2107,12 @@
     {"key": "oneway", "value": "alternate", "description": "🄳 ➜ oneway=alternating"},
     {"key": "oneway", "value": "no;yes", "description": "🄳"},
     {"key": "oneway", "value": "unknown", "description": "🄳"},
+    {"key": "operator:type", "value": "goverment", "description": "🄳 ➜ operator:type=government"},
+    {"key": "operator:type", "value": "Privado", "description": "🄳 ➜ operator:type=private"},
+    {"key": "operator:type", "value": "Private", "description": "🄳 ➜ operator:type=private"},
+    {"key": "operator:type", "value": "Public", "description": "🄳 ➜ operator:type=public"},
+    {"key": "operator:type", "value": "Publico", "description": "🄳 ➜ operator:type=public"},
+    {"key": "operator:type", "value": "unknown", "description": "🄳"},
     {"key": "place_name", "description": "🄳 ➜ name=*"},
     {"key": "pole", "value": "transition", "description": "🄳 ➜ location:transition=yes"},
     {"key": "postcode", "description": "🄳 ➜ addr:postcode=*"},

data/update_locales.js

@@ -3,6 +3,7 @@ const fs = require('fs');
 const prettyStringify = require('json-stringify-pretty-compact');
 const request = require('request').defaults({ maxSockets: 1 });
 const YAML = require('js-yaml');
+const colors = require('colors/safe');
 
 const resources = ['core', 'presets', 'imagery', 'community'];
 const outdir = './dist/locales/';
@@ -27,6 +28,8 @@ const sourcePresets = YAML.load(fs.readFileSync('./data/presets.yaml', 'utf8'));
 const sourceImagery = YAML.load(fs.readFileSync('./node_modules/editor-layer-index/i18n/en.yaml', 'utf8'));
 const sourceCommunity = YAML.load(fs.readFileSync('./node_modules/osm-community-index/i18n/en.yaml', 'utf8'));
 
+const dataShortcuts = JSON.parse(fs.readFileSync('./data/shortcuts.json', 'utf8')).dataShortcuts;
+
 const cldrMainDir = './node_modules/cldr-localenames-full/main/';
 
 var referencedScripts = [];
@@ -36,6 +39,26 @@ const languageInfo = {
 };
 fs.writeFileSync('data/languages.json', JSON.stringify(languageInfo, null, 4));
 
+var shortcuts = [];
+dataShortcuts.forEach(function(tab) {
+    tab.columns.forEach(function(col) {
+        col.rows.forEach(function(row) {
+            if (!row.shortcuts) return;
+            row.shortcuts.forEach(function(shortcut) {
+                if (shortcut.includes('.')) {
+                    var info = {
+                        shortcut: shortcut
+                    };
+                    if (row.modifiers) {
+                        info.modifier = row.modifiers.join('');
+                    }
+                    shortcuts.push(info);
+                }
+            });
+        });
+    });
+});
+
 asyncMap(resources, getResource, function(err, results) {
     if (err) return console.log(err);
 
@@ -133,6 +156,8 @@ function getResource(resource, callback) {
                                 }
                             }
                         }
+                    } else if (resource === 'core') {
+                        checkForDuplicateShortcuts(codes[i], result);
                     }
 
                     locale[codes[i]] = result;
@@ -212,6 +237,36 @@ function asyncMap(inputs, func, callback) {
     }
 }
 
+function checkForDuplicateShortcuts(code, coreStrings) {
+    var usedShortcuts = {};
+
+    shortcuts.forEach(function(shortcutInfo) {
+        var shortcutPathString = shortcutInfo.shortcut;
+        var modifier = shortcutInfo.modifier || '';
+
+        var path = shortcutPathString
+            .split('.')
+            .map(function (s) { return s.replace(/<TX_DOT>/g, '.'); })
+            .reverse();
+
+        var rep = coreStrings;
+
+        while (rep !== undefined && path.length) {
+            rep = rep[path.pop()];
+        }
+
+        if (rep !== undefined) {
+            var shortcut = modifier + rep;
+            if (usedShortcuts[shortcut] && usedShortcuts[shortcut] !== shortcutPathString) {
+                var message = code + ': duplicate shortcut "' + shortcut + '" for "' + usedShortcuts[shortcut] + '" and "' + shortcutPathString + '"';
+                console.warn(colors.yellow(message));
+            } else {
+                usedShortcuts[shortcut] = shortcutPathString;
+            }
+        }
+    });
+}
+
 function getLangNamesInNativeLang() {
     // manually add languages we want that aren't in CLDR
     var unordered = {