Add identifier field for tags linking features to external databases

Add US-only field for `gnis:feature_id` (close #7086)
Add tooltip to wikipedia field link button

css/80_app.css

@@ -1813,16 +1813,20 @@ button.preset-favorite-button.active .icon {
 .form-field-input-url > input:only-of-type {
     border-radius: 0 0 4px 4px;
 }
-.form-field-input-number > input:only-of-type {
+.form-field-input-number > input:only-of-type,
+.form-field-input-identifier > input:only-of-type {
     border-radius: 0 0 0 4px;
 }
-[dir='rtl'] .form-field-input-number > input:only-of-type {
+[dir='rtl'] .form-field-input-number > input:only-of-type,
+[dir='rtl'] .form-field-input-identifier > input:only-of-type {
     border-radius: 0 0 4px 0;
 }
-.form-field-input-number > button:last-of-type {
+.form-field-input-number > button:last-of-type,
+.form-field-input-identifier > button:last-of-type {
     border-radius: 0 0 4px 0;
 }
-[dir='rtl'] .form-field-input-number > button:last-of-type {
+[dir='rtl'] .form-field-input-number > button:last-of-type,
+[dir='rtl'] .form-field-input-identifier > button:last-of-type {
     border-radius: 0 0 0 4px;
 }
 

data/core.yaml

@@ -6,7 +6,7 @@ en:
     undo: undo
     zoom_to: zoom to
     copy: copy
-    open_wikidata: open on wikidata.org
+    view_on: view on {domain}
     favorite: favorite
   toolbar:
     inspect: Inspect

data/presets.yaml

@@ -897,6 +897,11 @@ en:
       generator/type:
         # 'generator:type=*'
         label: Type
+      gnis/feature_id:
+        # 'gnis:feature_id=*'
+        label: GNIS Feature ID
+        # 'terms: Federal Geographic Names Information Service,United States Board on Geographic Names,USA'
+        terms: '[translate with synonyms or related terms for ''GNIS Feature ID'', separated by commas]'
       government:
         # government=*
         label: Type

data/presets/README.md

@@ -260,6 +260,7 @@ A string specifying the UI and behavior of the field. Must be one of the followi
 * `tel` - Text field for entering phone numbers (localized for editing location)
 * `email` - Text field for entering email addresses
 * `url` - Text field for entering URLs
+* `identifier` - Text field for foreign IDs (e.g. `gnis:feature_id`)
 * `textarea` - Multi-line text area (e.g. `description=*`)
 
 ###### Combo/Dropdown fields
@@ -422,6 +423,18 @@ By default, fields are available everywhere.
 
 An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blacklist instead of a whitelist.
 
+##### `urlFormat`
+
+For `identifier` fields, the permalink URL of the external record. It must contain a `{value}` placeholder where the tag value will be inserted. For example:
+
+```js
+"urlFormat": "https://geonames.usgs.gov/apex/f?p=gnispq:3:::NO::P3_FID:{value}"
+```
+
+##### `pattern`
+
+For `identifier` fields, the regular expression that valid values are expected to match to be linkable.
+
 
 ## Building
 

data/presets/fields.json

@@ -161,6 +161,7 @@
     "generator/output/electricity": {"key": "generator:output:electricity", "type": "typeCombo", "label": "Power Output", "placeholder": "50 MW, 100 MW, 200 MW...", "snake_case": false},
     "generator/source": {"key": "generator:source", "type": "combo", "label": "Source"},
     "generator/type": {"key": "generator:type", "type": "combo", "label": "Type"},
+    "gnis/feature_id": {"key": "gnis:feature_id", "type": "identifier", "label": "GNIS Feature ID", "urlFormat": "https://geonames.usgs.gov/apex/f?p=gnispq:3:::NO::P3_FID:{value}", "pattern": "^[0-9]{1,}$", "countryCodes": ["us"], "terms": ["Federal Geographic Names Information Service", "United States Board on Geographic Names", "USA"]},
     "government": {"key": "government", "type": "typeCombo", "label": "Type"},
     "grape_variety": {"key": "grape_variety", "type": "semiCombo", "label": "Grape Varieties"},
     "guest_house": {"key": "guest_house", "type": "combo", "label": "Type"},

data/presets/fields/gnis/feature_id.json

@@ -0,0 +1,13 @@
+{
+    "key": "gnis:feature_id",
+    "type": "identifier",
+    "label": "GNIS Feature ID",
+    "urlFormat": "https://geonames.usgs.gov/apex/f?p=gnispq:3:::NO::P3_FID:{value}",
+    "pattern": "^[0-9]{1,}$",
+    "countryCodes": ["us"],
+    "terms": [
+        "Federal Geographic Names Information Service",
+        "United States Board on Geographic Names",
+        "USA"
+    ]
+}

data/presets/presets.json

@@ -14,8 +14,8 @@
     "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "searchable": false, "name": "Land Use"},
     "leisure": {"icon": "maki-pitch", "fields": ["name", "leisure"], "geometry": ["point", "vertex", "line", "area"], "tags": {"leisure": "*"}, "searchable": false, "name": "Leisure"},
     "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "matchScore": 0.95, "searchable": false, "name": "Man Made"},
-    "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural"},
-    "place": {"fields": ["name", "place"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"},
+    "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural"},
+    "place": {"fields": ["name", "place"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"},
     "playground": {"icon": "maki-playground", "fields": ["playground", "playground/theme", "min_age", "max_age", "wheelchair", "blind", "height"], "moreFields": ["access_simple", "colour", "ref"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"},
     "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power"},
     "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway"},
@@ -42,7 +42,7 @@
     "aerialway/rope_tow": {"geometry": ["line"], "terms": ["handle tow", "bugel lift"], "fields": ["name", "oneway_yes", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "rope_tow"}, "name": "Rope Tow Lift"},
     "aerialway/t-bar": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["tbar"], "tags": {"aerialway": "t-bar"}, "name": "T-bar Lift"},
     "aerialway/zip_line": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/duration", "maxweight", "access_simple"], "terms": ["aerial runway", "canopy", "flying fox", "foefie slide", "gravity propelled aerial ropeslide", "Tyrolean traverse", "zip wire", "zip-line", "zipline", "zipwire"], "tags": {"aerialway": "zip_line"}, "name": "Zip Line"},
-    "aeroway/aerodrome": {"icon": "maki-airport", "geometry": ["point", "area"], "fields": ["name", "iata", "icao", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "tags": {"aeroway": "aerodrome"}, "matchScore": 0.9, "name": "Airport"},
+    "aeroway/aerodrome": {"icon": "maki-airport", "geometry": ["point", "area"], "fields": ["name", "iata", "icao", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["gnis/feature_id"], "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "tags": {"aeroway": "aerodrome"}, "matchScore": 0.9, "name": "Airport"},
     "aeroway/apron": {"icon": "maki-airport", "geometry": ["area"], "terms": ["ramp"], "fields": ["ref", "surface"], "tags": {"aeroway": "apron"}, "name": "Apron"},
     "aeroway/gate": {"icon": "maki-airport", "geometry": ["point"], "fields": ["ref_aeroway_gate"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"},
     "aeroway/hangar": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name", "building_area"], "tags": {"aeroway": "hangar"}, "addTags": {"building": "hangar", "aeroway": "hangar"}, "name": "Hangar"},
@@ -65,13 +65,13 @@
     "amenity/register_office": {"icon": "maki-town-hall", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"amenity": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office", "searchable": false},
     "amenity/scrapyard": {"icon": "temaki-junk_car", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "scrapyard"}, "reference": {"key": "industrial", "value": "scrap_yard"}, "name": "Scrap Yard", "searchable": false},
     "amenity/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "swimming_pool"}, "reference": {"key": "leisure", "value": "swimming_pool"}, "name": "Swimming Pool", "searchable": false},
-    "amenity/animal_boarding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_boarding"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["boarding", "cat", "cattery", "dog", "horse", "kennel", "kitten", "pet", "pet boarding", "pet care", "pet hotel", "puppy", "reptile"], "tags": {"amenity": "animal_boarding"}, "name": "Animal Boarding Facility"},
-    "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "moreFields": ["email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"},
-    "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca", "pound"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
-    "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "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/animal_boarding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_boarding"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["boarding", "cat", "cattery", "dog", "horse", "kennel", "kitten", "pet", "pet boarding", "pet care", "pet hotel", "puppy", "reptile"], "tags": {"amenity": "animal_boarding"}, "name": "Animal Boarding Facility"},
+    "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"},
+    "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca", "pound"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
+    "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", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "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", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
+    "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "currency_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "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", "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"},
@@ -84,36 +84,36 @@
     "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/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", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access/ssid", "level", "min_age", "not/name", "opening_hours", "payment_multi", "phone", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+    "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "bar", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access/ssid", "level", "min_age", "not/name", "opening_hours", "payment_multi", "phone", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
     "amenity/car_pooling": {"icon": "temaki-car_pool", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "lit"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
     "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": ["email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
-    "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["email", "fax", "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", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
+    "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", "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", "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", "email", "fax", "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", "email", "fax", "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/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/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "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", "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"},
     "amenity/clinic/fertility": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["egg", "fertility", "reproductive", "sperm", "ovulation"], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "fertility"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Fertility Clinic"},
     "amenity/clock": {"icon": "temaki-clock", "fields": ["name", "support", "display", "visibility", "date", "faces"], "moreFields": ["covered", "height", "indoor", "level", "lit", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["time"], "tags": {"amenity": "clock"}, "name": "Clock"},
     "amenity/clock/sundial": {"icon": "temaki-clock", "fields": ["name", "support", "visibility", "inscription"], "moreFields": [], "geometry": ["point", "vertex"], "terms": ["gnomon", "shadow"], "tags": {"amenity": "clock", "display": "sundial"}, "reference": {"key": "display", "value": "sundial"}, "name": "Sundial"},
-    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["denomination", "email", "fax", "internet_access/ssid", "phone", "religion", "wheelchair"], "geometry": ["point", "area"], "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", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
+    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["denomination", "email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "religion", "wheelchair"], "geometry": ["point", "area"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
+    "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
     "amenity/community_centre/lgbtq": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["lgbtq event", "lgbtq hall", "lgbt event", "lgbt hall", "lgb event", "lgb hall"], "tags": {"amenity": "community_centre", "lgbtq": "primary"}, "name": "LGBTQ+ Community Center"},
     "amenity/compressed_air": {"icon": "fas-tachometer-alt", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "covered", "lit"], "moreFields": ["brand", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
-    "amenity/conference_centre": {"icon": "fas-user-tie", "fields": ["name", "operator", "building_area", "address", "website", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/fee", "internet_access/ssid", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "conference_centre"}, "terms": ["auditorium", "conference", "exhibition", "exposition", "lecture"], "name": "Convention Center"},
-    "amenity/courthouse": {"icon": "fas-gavel", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "level", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
-    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
-    "amenity/dentist": {"icon": "maki-dentist", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
-    "amenity/dive_centre": {"icon": "temaki-scuba_diving", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
-    "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
-    "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
+    "amenity/conference_centre": {"icon": "fas-user-tie", "fields": ["name", "operator", "building_area", "address", "website", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "conference_centre"}, "terms": ["auditorium", "conference", "exhibition", "exposition", "lecture"], "name": "Convention Center"},
+    "amenity/courthouse": {"icon": "fas-gavel", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
+    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "level", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
+    "amenity/dentist": {"icon": "maki-dentist", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
+    "amenity/dive_centre": {"icon": "temaki-scuba_diving", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
+    "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
+    "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
     "amenity/dressing_room": {"icon": "maki-clothing-store", "fields": ["operator", "access_simple", "gender", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "payment_multi_fee", "ref"], "geometry": ["point", "area"], "terms": ["changeroom", "dressing room", "fitting room", "locker room"], "tags": {"amenity": "dressing_room"}, "name": "Changing Room"},
     "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "wheelchair"], "moreFields": ["covered", "indoor", "level", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
-    "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
-    "amenity/events_venue": {"icon": "fas-users", "fields": ["name", "operator", "building_area", "address", "website", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "events_venue"}, "terms": ["banquet hall", "baptism", "Bar Mitzvah", "Bat Mitzvah", "birthdays", "celebrations", "conferences", "confirmation", "meetings", "parties", "party", "quinceañera", "reunions", "weddings"], "name": "Events Venue"},
-    "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
+    "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
+    "amenity/events_venue": {"icon": "fas-users", "fields": ["name", "operator", "building_area", "address", "website", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "events_venue"}, "terms": ["banquet hall", "baptism", "Bar Mitzvah", "Bat Mitzvah", "birthdays", "celebrations", "conferences", "confirmation", "meetings", "parties", "party", "quinceañera", "reunions", "weddings"], "name": "Events Venue"},
+    "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
     "amenity/fast_food/ice_cream": {"icon": "fas-ice-cream", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "ice_cream"}, "reference": {"key": "cuisine", "value": "ice_cream"}, "name": "Ice Cream Fast Food", "searchable": false},
     "amenity/fast_food/burger": {"icon": "maki-fast-food", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Fast Food"},
     "amenity/fast_food/chicken": {"icon": "fas-drumstick-bite", "geometry": ["point", "area"], "terms": ["breakfast", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "name": "Chicken Fast Food"},
@@ -124,29 +124,29 @@
     "amenity/fast_food/mexican": {"icon": "fas-pepper-hot", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "tacos", "burritos", "enchiladas", "fajitas", "nachos", "tortillas", "salsa", "tamales", "quesadillas"], "tags": {"amenity": "fast_food", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Fast Food"},
     "amenity/fast_food/pizza": {"icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "terms": ["dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "fast_food", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Fast Food"},
     "amenity/fast_food/sandwich": {"icon": "temaki-sandwich", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "sandwich"}, "reference": {"key": "cuisine", "value": "sandwich"}, "name": "Sandwich Fast Food"},
-    "amenity/fire_station": {"icon": "maki-fire-station", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
-    "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["capacity", "diet_multi", "email", "fax", "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/fire_station": {"icon": "maki-fire-station", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
+    "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": ["building", "email", "fax", "opening_hours", "payment_multi", "phone", "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", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
+    "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["building", "email", "fax", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
+    "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
     "amenity/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
-    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
+    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
     "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple", "lockable"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
-    "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["delivery", "diet_multi", "drive_through", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
-    "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
-    "amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "payment_multi", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
-    "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "level", "max_age", "min_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
-    "amenity/language_school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "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/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["delivery", "diet_multi", "drive_through", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
+    "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
+    "amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "payment_multi", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
+    "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
+    "amenity/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", "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", "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", "min_age", "payment_multi", "phone", "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", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
-    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
+    "amenity/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", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
+    "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
+    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
     "amenity/money_transfer": {"icon": "temaki-money_hand", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["money order", "check", "bill", "currency", "finance", "wire transfer", "cable", "person to person", "cash to cash", "exchange"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"},
     "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"},
-    "amenity/music_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
-    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
+    "amenity/music_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
+    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
     "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
     "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
@@ -156,9 +156,9 @@
     "amenity/parking/underground": {"icon": "temaki-car_structure", "fields": ["{amenity/parking}", "layer"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "parking": "underground"}, "addTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "reference": {"key": "parking", "value": "underground"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "subsurface parking", "truck parking", "vehicle parking"], "matchScore": 1.05, "name": "Underground Parking"},
     "amenity/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": ["email", "fax", "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", "drive_through", "dispensing"], "moreFields": ["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/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", "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", "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"},
@@ -170,26 +170,26 @@
     "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"},
     "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"},
     "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
-    "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "charge_fee", "email", "fax", "fee", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
-    "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
-    "amenity/polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"amenity": "polling_station"}, "addTags": {"amenity": "polling_station", "polling_station": "yes"}, "name": "Permanent Polling Place"},
-    "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["access_simple", "brand", "covered", "height", "indoor", "level", "manufacturer", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["drop box", "dropbox", "letter drop", "mail box", "mail collection box", "mail drop", "mail dropoff", "mailbox", "package drop", "pillar box", "pillarbox", "post box", "postal box", "postbox"], "name": "Mail Drop Box"},
-    "amenity/post_depot": {"icon": "fas-mail-bulk", "fields": ["name", "operator", "address", "building_area", "phone"], "moreFields": ["email", "fax", "opening_hours", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["mail processing and distribution center", "post depot"], "tags": {"amenity": "post_depot"}, "name": "Post Sorting Office"},
-    "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["brand", "email", "fax", "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", "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", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "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", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
+    "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
+    "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
+    "amenity/polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"amenity": "polling_station"}, "addTags": {"amenity": "polling_station", "polling_station": "yes"}, "name": "Permanent Polling Place"},
+    "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["access_simple", "brand", "covered", "gnis/feature_id", "height", "indoor", "level", "manufacturer", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["drop box", "dropbox", "letter drop", "mail box", "mail collection box", "mail drop", "mail dropoff", "mailbox", "package drop", "pillar box", "pillarbox", "post box", "postal box", "postbox"], "name": "Mail Drop Box"},
+    "amenity/post_depot": {"icon": "fas-mail-bulk", "fields": ["name", "operator", "address", "building_area", "phone"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["mail processing and distribution center", "post depot"], "tags": {"amenity": "post_depot"}, "name": "Post Sorting Office"},
+    "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
+    "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["academic", "ACT", "SAT", "homework", "math", "reading", "test prep", "tutoring", "writing"], "tags": {"amenity": "prep_school"}, "name": "Test Prep / Tutoring School"},
+    "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "operator/type", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
+    "amenity/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", "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", "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"},
+    "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"},
     "amenity/public_bookcase": {"icon": "maki-library", "fields": ["name", "public_bookcase/type", "operator", "opening_hours", "capacity", "website", "lit"], "moreFields": ["access_simple", "address", "brand", "email", "level", "location", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["library", "bookcrossing"], "tags": {"amenity": "public_bookcase"}, "name": "Public Bookcase"},
-    "amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["visitor center", "visitor centre", "permit center", "permit centre", "backcountry office", "warden office", "warden center"], "tags": {"amenity": "ranger_station"}, "name": "Ranger Station"},
+    "amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["visitor center", "visitor centre", "permit center", "permit centre", "backcountry office", "warden office", "warden center"], "tags": {"amenity": "ranger_station"}, "name": "Ranger Station"},
     "amenity/recycling_centre": {"icon": "maki-recycling", "fields": ["name", "operator", "operator/type", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["charge_fee", "email", "fax", "fee", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bottle", "can", "dump", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "centre"}, "reference": {"key": "recycling_type", "value": "*"}, "name": "Recycling Center"},
     "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["operator", "recycling_accepts", "collection_times"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer", "material", "opening_hours"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
     "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", "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", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "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/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", "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", "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/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"},
@@ -209,38 +209,38 @@
     "amenity/restaurant/turkish": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "turkish"}, "reference": {"key": "cuisine", "value": "turkish"}, "name": "Turkish Restaurant"},
     "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"},
     "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
-    "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
-    "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
+    "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
+    "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["gnis/feature_id", "lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
     "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"},
     "amenity/shelter/lean_to": {"icon": "temaki-sleep_shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"},
     "amenity/shelter/picnic_shelter": {"icon": "temaki-picnic_shelter", "fields": ["name", "shelter_type", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"},
     "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", "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", "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", "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", "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_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"},
     "amenity/social_facility/homeless_shelter": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": ["houseless", "unhoused", "displaced"], "tags": {"amenity": "social_facility", "social_facility": "shelter", "social_facility:for": "homeless"}, "reference": {"key": "social_facility", "value": "shelter"}, "name": "Homeless Shelter"},
     "amenity/social_facility/nursing_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["elderly", "living", "nursing", "old", "senior", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "nursing_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home"},
-    "amenity/studio": {"icon": "fas-microphone", "fields": ["name", "studio", "address", "building_area", "website"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
+    "amenity/studio": {"icon": "fas-microphone", "fields": ["name", "studio", "address", "building_area", "website"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
     "amenity/studio/audio": {"icon": "fas-microphone", "geometry": ["point", "area"], "terms": ["audio mixing", "audio production", "audio recording", "audio studio"], "tags": {"amenity": "studio", "studio": "audio"}, "reference": {"key": "studio", "value": "audio"}, "name": "Recording Studio"},
     "amenity/studio/radio": {"icon": "fas-microphone", "geometry": ["point", "area"], "terms": ["am radio", "fm radio", "radio broadcast", "radio studio"], "tags": {"amenity": "studio", "studio": "radio"}, "reference": {"key": "studio", "value": "radio"}, "name": "Radio Station"},
     "amenity/studio/television": {"icon": "fas-video", "geometry": ["point", "area"], "terms": ["television broadcast", "television studio", "tv broadcast", "tv station", "tv studio"], "tags": {"amenity": "studio", "studio": "television"}, "reference": {"key": "studio", "value": "television"}, "name": "Television Station"},
     "amenity/studio/video": {"icon": "fas-video", "geometry": ["point", "area"], "terms": ["movie production", "movie studio", "video production", "video recording", "video studio"], "tags": {"amenity": "studio", "studio": "video"}, "reference": {"key": "studio", "value": "video"}, "name": "Film Studio"},
     "amenity/taxi": {"icon": "fas-taxi", "fields": ["name", "operator", "capacity", "address"], "moreFields": ["access_simple", "brand", "opening_hours", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"},
     "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi_fee", "charge_fee", "booth"], "moreFields": ["covered", "indoor", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "lit", "ref", "sms", "video_calls", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"},
-    "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area", "website"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
+    "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
     "amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["open air", "outdoor", "greek", "ampi"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"},
     "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", "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": ["email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
     "amenity/townhall/city": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["council", "courthouse", "government", "mayor", "municipality"], "tags": {"amenity": "townhall", "townhall:type": "city"}, "name": "City Hall"},
     "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
     "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
-    "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
+    "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
     "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "ref", "operator", "payment_multi", "currency_multi"], "moreFields": ["blind", "brand", "covered", "height", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
     "amenity/vending_machine/bottle_return": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point", "vertex"], "terms": ["bottle return"], "tags": {"amenity": "vending_machine", "vending": "bottle_return"}, "reference": {"key": "vending", "value": "bottle_return"}, "name": "Bottle Return Machine"},
     "amenity/vending_machine/bread": {"icon": "temaki-vending_bread", "geometry": ["point", "vertex"], "terms": ["baguette", "bread"], "tags": {"amenity": "vending_machine", "vending": "bread"}, "reference": {"key": "vending", "value": "bread"}, "name": "Bread Vending Machine"},
@@ -264,7 +264,7 @@
     "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_tickets", "geometry": ["point", "vertex"], "terms": ["bus", "train", "ferry", "rail", "ticket", "transportation"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "name": "Transit Ticket Vending Machine"},
     "amenity/vending_machine/stamps": {"icon": "temaki-vending_stamps", "geometry": ["point", "vertex"], "terms": ["mail", "postage", "stamp"], "tags": {"amenity": "vending_machine", "vending": "stamps"}, "reference": {"key": "vending", "value": "stamps"}, "name": "Postage Vending Machine"},
     "amenity/vending_machine/sweets": {"icon": "temaki-vending_machine", "geometry": ["point", "vertex"], "terms": ["candy", "gum", "chip", "pretzel", "cookie", "cracker"], "tags": {"amenity": "vending_machine", "vending": "sweets"}, "reference": {"key": "vending", "value": "sweets"}, "name": "Snack Vending Machine"},
-    "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "level", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
+    "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "level", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
     "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "waste", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"},
     "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "waste", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"},
     "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
@@ -327,7 +327,7 @@
     "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support", "height", "layer", "material"], "moreFields": ["colour", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
     "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support", "{bridge/support}"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
     "building_part": {"icon": "maki-building", "fields": ["levels", "height", "building/material", "roof/colour"], "moreFields": ["layer"], "geometry": ["area"], "tags": {"building:part": "*"}, "matchScore": 0.5, "terms": ["roof", "simple 3D buildings"], "name": "Building Part"},
-    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/levels/underground", "building/material", "layer", "not/name", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
+    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/levels/underground", "building/material", "gnis/feature_id", "layer", "not/name", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
     "building/bunker": {"geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
     "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
     "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false},
@@ -379,9 +379,9 @@
     "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/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", "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": {"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"},
-    "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
+    "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "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", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
     "craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false},
     "craft/tailor": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"craft": "tailor"}, "reference": {"key": "shop", "value": "tailor"}, "name": "Tailor", "searchable": false},
     "craft/agricultural_engines": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "name": "Argricultural Engines Mechanic"},
@@ -440,7 +440,7 @@
     "emergency/official": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "official"}, "name": "Emergency Access Official", "searchable": false, "matchScore": 0.01},
     "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01},
     "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01},
-    "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
+    "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
     "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
     "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"},
     "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
@@ -453,7 +453,7 @@
     "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"},
-    "ford": {"icon": "temaki-pedestrian", "fields": ["name", "access", "seasonal"], "geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
+    "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"},
     "golf/driving_range": {"icon": "maki-golf", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"golf": "driving_range"}, "addTags": {"golf": "driving_range", "landuse": "grass"}, "name": "Driving Range"},
@@ -465,7 +465,7 @@
     "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough"}, "addTags": {"golf": "rough", "landuse": "grass"}, "name": "Rough"},
     "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee"}, "addTags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "name": "Tee Box"},
     "golf/water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard"}, "addTags": {"golf": "water_hazard", "natural": "water"}, "name": "Water Hazard"},
-    "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["brand", "building/levels_building", "email", "fax", "height_building", "level", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
+    "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "level", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
     "healthcare/alternative": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["acupuncture", "anthroposophical", "applied kinesiology", "aromatherapy", "ayurveda", "herbalism", "homeopathy", "hydrotherapy", "hypnosis", "naturopathy", "osteopathy", "reflexology", "reiki", "shiatsu", "traditional", "tuina", "unani"], "tags": {"healthcare": "alternative"}, "name": "Alternative Medicine"},
     "healthcare/alternative/chiropractic": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["back", "pain", "spine"], "tags": {"healthcare": "alternative", "healthcare:speciality": "chiropractic"}, "name": "Chiropractor"},
     "healthcare/audiologist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["ear", "hearing", "sound"], "tags": {"healthcare": "audiologist"}, "name": "Audiologist"},
@@ -520,7 +520,7 @@
     "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["destination_oneway", "destination/ref_oneway", "junction/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "destination/symbol_oneway", "incline", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "name", "ref_road_number", "smoothness", "toll", "width"], "geometry": ["line"], "tags": {"highway": "motorway_link"}, "terms": ["exit", "ramp", "road", "street", "on ramp", "off ramp"], "name": "Motorway Link"},
     "highway/motorway": {"icon": "iD-highway-motorway", "fields": ["name", "ref_road_number", "oneway_yes", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "incline", "junction_line", "lit", "maxheight", "maxweight_bridge", "minspeed", "not/name", "smoothness", "toll", "width"], "geometry": ["line"], "tags": {"highway": "motorway"}, "terms": ["autobahn", "expressway", "freeway", "highway", "interstate", "parkway", "road", "street", "thruway", "turnpike"], "name": "Motorway"},
     "highway/passing_place": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "passing_place"}, "terms": ["turnout, pullout"], "name": "Passing Place"},
-    "highway/path": {"icon": "iD-other-line", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "horse_scale", "informal", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "not/name", "ref", "sac_scale", "smoothness", "stroller", "trail_visibility", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"},
+    "highway/path": {"icon": "iD-other-line", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "gnis/feature_id", "horse_scale", "informal", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "not/name", "ref", "sac_scale", "smoothness", "stroller", "trail_visibility", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"},
     "highway/path/informal": {"icon": "iD-other-line", "fields": ["surface", "width", "access", "trail_visibility", "smoothness", "incline"], "moreFields": ["covered", "dog", "horse_scale", "informal", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "sac_scale", "stroller", "structure", "wheelchair"], "geometry": ["line"], "terms": ["bootleg trail", "cow path", "desire line", "desire path", "desireline", "desirepath", "elephant path", "game trail", "goat track", "herd path", "pig trail", "shortcut", "social trail", "use trail"], "tags": {"highway": "path", "informal": "yes"}, "reference": {"key": "informal"}, "name": "Informal Path"},
     "highway/pedestrian_area": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["area"], "tags": {"highway": "pedestrian", "area": "yes"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Area"},
     "highway/pedestrian_line": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "oneway", "structure", "access"], "moreFields": ["covered", "incline", "maxweight_bridge", "smoothness"], "geometry": ["line"], "tags": {"highway": "pedestrian"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Street"},
@@ -551,15 +551,15 @@
     "highway/track": {"icon": "fas-truck-monster", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["covered", "flood_prone", "horse_scale", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"},
     "highway/traffic_mirror": {"icon": "maki-circle-stroked", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"highway": "traffic_mirror"}, "terms": ["blind spot", "convex", "corner", "curved", "roadside", "round", "safety", "sphere", "visibility"], "name": "Traffic Mirror"},
     "highway/traffic_signals": {"icon": "temaki-traffic_signals", "geometry": ["vertex"], "tags": {"highway": "traffic_signals"}, "fields": ["traffic_signals", "traffic_signals/direction"], "terms": ["light", "stoplight", "traffic light"], "name": "Traffic Signals"},
-    "highway/trailhead": {"icon": "fas-hiking", "fields": ["name", "operator", "elevation", "address", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["opening_hours"], "geometry": ["vertex"], "tags": {"highway": "trailhead"}, "terms": ["hiking", "mile zero", "mountain biking", "mountaineering", "trail endpoint", "trail start", "staging area", "trekking"], "name": "Trailhead"},
+    "highway/trailhead": {"icon": "fas-hiking", "fields": ["name", "operator", "elevation", "address", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["gnis/feature_id", "opening_hours"], "geometry": ["vertex"], "tags": {"highway": "trailhead"}, "terms": ["hiking", "mile zero", "mountain biking", "mountaineering", "trail endpoint", "trail start", "staging area", "trekking"], "name": "Trailhead"},
     "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["{highway/motorway_link}"], "moreFields": ["{highway/motorway_link}"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"},
     "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "incline", "junction_line", "lit", "maxheight", "maxweight_bridge", "minspeed", "not/name", "smoothness", "toll", "width"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"},
     "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"], "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": "*"}, "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": ["material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"},
+    "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "moreFields": ["{historic}", "material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"},
     "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"},
@@ -567,14 +567,14 @@
     "historic/city_gate": {"icon": "maki-castle", "fields": ["name", "building_area", "historic/civilization", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "city_gate"}, "terms": ["Town Gate"], "name": "City Gate"},
     "historic/fort": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "fort"}, "terms": ["military"], "name": "Historic Fort"},
     "historic/manor": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "manor"}, "terms": ["Mansion", "gentry", "nobility", "estate"], "name": "Manor House"},
-    "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription", "material"], "moreFields": ["website"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "remember", "remembrance", "memory", "monument", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"},
+    "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription", "material"], "moreFields": ["{historic}", "website"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "remember", "remembrance", "memory", "monument", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"},
     "historic/memorial/plaque": {"icon": "temaki-plaque", "fields": ["{historic/memorial}", "direction"], "geometry": ["point", "vertex"], "terms": ["dedicatory", "epitaph", "historical marker", "remember", "remembrance", "memory"], "tags": {"historic": "memorial", "memorial": "plaque"}, "reference": {"key": "memorial", "value": "plaque"}, "name": "Commemorative Plaque"},
-    "historic/monument": {"icon": "maki-monument", "fields": ["name", "inscription", "access_simple"], "moreFields": ["material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "monument"}, "name": "Monument"},
+    "historic/monument": {"icon": "maki-monument", "fields": ["name", "inscription", "access_simple"], "moreFields": ["{historic}", "material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "monument"}, "name": "Monument"},
     "historic/ruins": {"icon": "temaki-ruins", "fields": ["name", "historic/civilization", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "ruins"}, "name": "Ruins"},
     "historic/tomb": {"icon": "maki-cemetery", "fields": ["name", "tomb", "building_area", "inscription", "access_simple"], "geometry": ["point", "area"], "tags": {"historic": "tomb"}, "name": "Tomb"},
-    "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"},
+    "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription"], "moreFields": ["{historic}", "material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"},
     "historic/wayside_shrine": {"icon": "maki-landmark", "fields": ["name", "religion", "denomination", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_shrine"}, "name": "Wayside Shrine"},
-    "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"},
+    "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "moreFields": ["{historic}", "seamark/type"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"},
     "indoor/corridor_line": {"fields": ["level", "name"], "geometry": ["line"], "tags": {"indoor": "corridor"}, "searchable": false, "matchScore": 1.1, "name": "Indoor Corridor", "replacement": "highway/corridor"},
     "indoor/area": {"fields": ["level", "name", "ref_room_number", "height"], "geometry": ["area"], "tags": {"indoor": "area"}, "terms": ["indoor space"], "matchScore": 0.8, "name": "Indoor Area"},
     "indoor/corridor": {"icon": "temaki-pedestrian", "fields": ["level", "name", "ref", "height"], "geometry": ["area"], "tags": {"indoor": "corridor"}, "terms": ["concourse", "foyer", "hallway", "passageway"], "matchScore": 0.8, "name": "Indoor Corridor"},
@@ -630,21 +630,21 @@
     "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", "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": ["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", "phone", "smoking", "website"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
+    "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/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", "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"], "moreFields": ["website"], "geometry": ["point", "area"], "terms": ["open space"], "tags": {"leisure": "common"}, "name": "Common"},
-    "leisure/dance": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["email", "fax", "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", "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", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "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", "phone", "website"], "geometry": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
+    "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/common": {"icon": "temaki-pedestrian", "fields": ["name", "access_simple"], "moreFields": ["gnis/feature_id", "website"], "geometry": ["point", "area"], "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": ["point", "area"], "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": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "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"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
     "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": ["charge_fee", "email", "fax", "fee", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"},
+    "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["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", "studio"], "name": "Gym / Fitness Center"},
     "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["studio", "asanas", "modern yoga", "meditation"], "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"},
@@ -658,19 +658,19 @@
     "leisure/fitness_station/sign": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sign"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sign", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Exercise Instruction Sign"},
     "leisure/fitness_station/sit-up": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sit-up"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sit-up", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["crunch", "exercise", "fitness", "gym", "situp", "sit up", "trim trail"], "name": "Sit-Up Station"},
     "leisure/fitness_station/stairs": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "stairs"}, "addTags": {"leisure": "fitness_station", "fitness_station": "stairs", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "steps", "trim trail"], "name": "Exercise Stairs"},
-    "leisure/garden": {"icon": "maki-garden", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
-    "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "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", "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", "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", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "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", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "seamark/type", "website"], "geometry": ["point", "vertex", "area"], "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", "phone", "website"], "geometry": ["point", "area"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"},
-    "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "phone", "website"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
+    "leisure/garden": {"icon": "maki-garden", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
+    "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "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": ["point", "area"], "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": ["point", "vertex", "area"], "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": ["point", "area"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"},
+    "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "website"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
     "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "moreFields": ["level"], "terms": ["al fresco", "beer garden", "dining", "cafe", "restaurant", "pub", "bar", "patio"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"},
-    "leisure/park": {"icon": "maki-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "phone", "smoking", "website"], "geometry": ["point", "area"], "terms": ["esplanade", "estate", "forest", "garden", "grass", "green", "grounds", "lawn", "lot", "meadow", "parkland", "place", "playground", "plaza", "pleasure garden", "recreation area", "square", "tract", "village green", "woodland"], "tags": {"leisure": "park"}, "name": "Park"},
+    "leisure/park": {"icon": "maki-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "smoking", "website"], "geometry": ["point", "area"], "terms": ["esplanade", "estate", "forest", "garden", "grass", "green", "grounds", "lawn", "lot", "meadow", "parkland", "place", "playground", "plaza", "pleasure garden", "recreation area", "square", "tract", "village green", "woodland"], "tags": {"leisure": "park"}, "name": "Park"},
     "leisure/picnic_table": {"icon": "maki-picnic-site", "fields": ["material", "lit", "bench"], "moreFields": ["level"], "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"},
     "leisure/picnic_table/chess": {"icon": "fas-chess-pawn", "geometry": ["point"], "tags": {"leisure": "picnic_table", "sport": "chess"}, "reference": {"key": "sport", "value": "chess"}, "terms": ["bench", "chess board", "checkerboard", "checkers", "chequerboard", "game table"], "name": "Chess Table"},
-    "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "access_simple", "surface", "lit"], "moreFields": ["charge_fee", "covered", "fee", "indoor", "payment_multi_fee"], "geometry": ["point", "area"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
+    "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "access_simple", "surface", "lit"], "moreFields": ["charge_fee", "covered", "fee", "gnis/feature_id", "indoor", "payment_multi_fee"], "geometry": ["point", "area"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
     "leisure/pitch/american_football": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "american_football"}, "reference": {"key": "sport", "value": "american_football"}, "terms": ["football", "gridiron"], "name": "American Football Field"},
     "leisure/pitch/australian_football": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "australian_football"}, "reference": {"key": "sport", "value": "australian_football"}, "terms": ["Aussie", "AFL", "football"], "name": "Australian Football Field"},
     "leisure/pitch/badminton": {"icon": "maki-tennis", "fields": ["{leisure/pitch}", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "badminton"}, "reference": {"key": "sport", "value": "badminton"}, "terms": [], "name": "Badminton Court"},
@@ -694,33 +694,33 @@
     "leisure/pitch/table_tennis": {"icon": "maki-tennis", "fields": ["name", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "table_tennis"}, "reference": {"key": "sport", "value": "table_tennis"}, "terms": ["table tennis", "ping pong"], "name": "Ping Pong Table"},
     "leisure/pitch/tennis": {"icon": "maki-tennis", "fields": ["{leisure/pitch}", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "tennis"}, "reference": {"key": "sport", "value": "tennis"}, "terms": [], "name": "Tennis Court"},
     "leisure/pitch/volleyball": {"icon": "maki-volleyball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "volleyball"}, "reference": {"key": "sport", "value": "volleyball"}, "terms": [], "name": "Volleyball Court"},
-    "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "playground/theme", "surface", "access_simple", "min_age", "max_age"], "moreFields": ["blind", "dog", "wheelchair"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"},
-    "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "resort", "address", "opening_hours"], "moreFields": ["access_simple", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "terms": ["recreation center", "sanatorium", "ski and snowboard resort", "vacation resort", "winter sports resort"], "name": "Resort"},
-    "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "level", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
+    "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "playground/theme", "surface", "access_simple", "min_age", "max_age"], "moreFields": ["blind", "dog", "gnis/feature_id", "wheelchair"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"},
+    "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "resort", "address", "opening_hours"], "moreFields": ["access_simple", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "terms": ["recreation center", "sanatorium", "ski and snowboard resort", "vacation resort", "winter sports resort"], "name": "Resort"},
+    "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
     "leisure/slipway_point": {"icon": "maki-slipway", "fields": ["{leisure/slipway}"], "moreFields": ["{leisure/slipway}"], "geometry": ["point", "vertex"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
     "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "surface", "access_simple", "fee", "payment_multi_fee", "charge_fee", "lanes"], "moreFields": ["lit", "opening_hours", "seamark/type", "width"], "geometry": ["line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "addTags": {"leisure": "slipway", "highway": "service", "service": "slipway"}, "matchScore": 1.1, "name": "Slipway"},
-    "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
+    "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": ["point", "area"], "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", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
+    "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
     "leisure/swimming_area": {"icon": "fas-swimmer", "fields": ["name", "access_simple", "supervised", "fee", "payment_multi_fee", "charge_fee", "lit"], "moreFields": ["opening_hours", "operator"], "geometry": ["area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"},
-    "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "opening_hours", "operator"], "geometry": ["point", "area"], "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", "indoor", "level"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"},
+    "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "gnis/feature_id", "opening_hours", "operator"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
+    "leisure/track": {"icon": "iD-other-line", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "moreFields": ["access", "covered", "gnis/feature_id", "indoor", "level"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"},
     "leisure/track/cycling_point": {"icon": "fas-biking", "fields": ["{leisure/track/cycling}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
     "leisure/track/cycling": {"icon": "fas-biking", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
     "leisure/track/horse_racing_point": {"icon": "maki-horse-riding", "fields": ["{leisure/track/horse_racing}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["equestrian race track", "horse race betting", "horseracing", "horsetrack", "horse racetrack"], "name": "Horse Racing Track"},
     "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["equestrian race track", "horse race betting", "horseracing", "horsetrack", "horse racetrack"], "name": "Horse Racing Track"},
     "leisure/track/running_point": {"icon": "maki-pitch", "fields": ["{leisure/track/running}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["athletics track", "decathlon", "foot race", "long distance running", "marathon", "middle distance running", "racetrack", "running", "sprint", "track", "walking"], "name": "Running Track"},
     "leisure/track/running": {"icon": "maki-pitch", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["athletics track", "decathlon", "foot race", "long distance running", "marathon", "middle distance running", "racetrack", "running", "sprint", "track", "walking"], "name": "Running Track"},
-    "leisure/water_park": {"icon": "fas-swimmer", "fields": ["name", "operator", "address"], "moreFields": ["brand", "email", "fax", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
+    "leisure/water_park": {"icon": "fas-swimmer", "fields": ["name", "operator", "address"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
     "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "terms": ["polyline"], "name": "Line", "matchScore": 0.1},
-    "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource", "direction"], "terms": ["cave", "horizontal mine entrance", "tunnel", "underground"], "tags": {"man_made": "adit"}, "name": "Adit"},
+    "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource", "direction"], "moreFields": ["gnis/feature_id"], "terms": ["cave", "horizontal mine entrance", "tunnel", "underground"], "tags": {"man_made": "adit"}, "name": "Adit"},
     "man_made/antenna": {"icon": "temaki-antenna", "fields": ["communication_multi", "operator", "manufacturer", "height"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
     "man_made/beacon": {"icon": "maki-communications-tower", "fields": ["name", "height"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"man_made": "beacon"}, "name": "Beacon", "matchScore": 0.5},
     "man_made/beehive": {"icon": "fas-archive", "geometry": ["point", "area"], "fields": ["ref", "operator", "seasonal", "height", "colour"], "moreFields": ["manufacturer"], "terms": ["apiary", "beekeeper", "farm", "honey", "pollination"], "tags": {"man_made": "beehive"}, "name": "Beehive"},
     "man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
-    "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge Area", "matchScore": 0.85},
-    "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
+    "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["gnis/feature_id", "manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge Area", "matchScore": 0.85},
+    "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
     "man_made/cairn": {"icon": "temaki-cairn", "geometry": ["point", "area"], "terms": ["rock pile", "stone stack", "stone pile", "càrn"], "tags": {"man_made": "cairn"}, "name": "Cairn"},
     "man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
     "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
@@ -732,7 +732,7 @@
     "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "moreFields": ["manufacturer", "material"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
     "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
     "man_made/groyne": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
-    "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["address", "email", "fax", "phone", "seamark/type", "website"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "addTags": {"man_made": "lighthouse", "seamark:type": "light_major"}, "removeTags": {"man_made": "lighthouse", "seamark:type": "*"}, "name": "Lighthouse"},
+    "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "phone", "seamark/type", "website"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "addTags": {"man_made": "lighthouse", "seamark:type": "light_major"}, "removeTags": {"man_made": "lighthouse", "seamark:type": "*"}, "name": "Lighthouse"},
     "man_made/manhole": {"icon": "temaki-manhole", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"},
     "man_made/manhole/drain": {"icon": "temaki-manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"},
     "man_made/manhole/gas": {"icon": "temaki-gas_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "gas"}, "addTags": {"man_made": "manhole", "manhole": "gas"}, "terms": ["cover", "gas", "heat", "hole", "utility"], "name": "Gas Utility Manhole"},
@@ -740,23 +740,23 @@
     "man_made/manhole/sewer": {"icon": "temaki-waste_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "sewer"}, "addTags": {"man_made": "manhole", "manhole": "sewer"}, "terms": ["cover", "drain", "hole", "sewer", "sewage", "utility"], "name": "Sewer Utility Manhole"},
     "man_made/manhole/telecom": {"icon": "temaki-cable_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["bt", "cable", "cover", "phone", "hole", "telecom", "telephone", "utility"], "name": "Telecom Utility Manhole"},
     "man_made/manhole/water": {"icon": "temaki-waste_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "water"}, "addTags": {"man_made": "manhole", "manhole": "water"}, "terms": ["cover", "drinking", "hole", "utility", "water"], "name": "Water Utility Manhole"},
-    "man_made/mast": {"icon": "temaki-mast", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["communication_multi", "manufacturer", "material"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
+    "man_made/mast": {"icon": "temaki-mast", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["communication_multi", "gnis/feature_id", "manufacturer", "material"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
     "man_made/mast/communication": {"icon": "temaki-mast_communication", "fields": ["{man_made/mast}", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Mast"},
     "man_made/mast/communication/mobile_phone": {"icon": "temaki-mast_communication", "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:mobile_phone": "yes"}, "reference": {"key": "communication:mobile_phone", "value": "yes"}, "name": "Mobile Phone Mast"},
     "man_made/mast/communication/radio": {"icon": "temaki-mast_communication", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "radio mast", "radio tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:radio": "yes"}, "reference": {"key": "communication:radio", "value": "yes"}, "name": "Radio Broadcast Mast"},
     "man_made/mast/communication/television": {"icon": "temaki-mast_communication", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "television mast", "television tower", "transmission mast", "transmission tower", "tv mast", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:television": "yes"}, "reference": {"key": "communication:television", "value": "yes"}, "name": "Television Broadcast Mast"},
-    "man_made/mineshaft": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource"], "terms": ["cave", "mine shaft", "tunnel", "underground", "vertical mine entrance"], "tags": {"man_made": "mineshaft"}, "name": "Mineshaft"},
+    "man_made/mineshaft": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource"], "moreFields": ["gnis/feature_id"], "terms": ["cave", "mine shaft", "tunnel", "underground", "vertical mine entrance"], "tags": {"man_made": "mineshaft"}, "name": "Mineshaft"},
     "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator", "manufacturer"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
     "man_made/obelisk": {"icon": "maki-monument", "fields": ["name", "inscription", "height", "material", "colour"], "geometry": ["point", "vertex", "area"], "tags": {"man_made": "obelisk"}, "name": "Obelisk"},
-    "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
-    "man_made/petroleum_well": {"icon": "temaki-oil_well", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
-    "man_made/pier": {"icon": "temaki-pier_fixed", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["{highway/footway}", "access", "fishing", "incline"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "name": "Pier"},
+    "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
+    "man_made/petroleum_well": {"icon": "temaki-oil_well", "moreFields": ["gnis/feature_id"], "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
+    "man_made/pier": {"icon": "temaki-pier_fixed", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["{highway/footway}", "access", "fishing", "gnis/feature_id", "incline"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "name": "Pier"},
     "man_made/pier/floating": {"icon": "temaki-pier_floating", "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier", "floating": "yes"}, "name": "Floating Pier"},
     "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["operator", "location", "substance", "layer", "diameter"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
     "man_made/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground Pipeline"},
     "man_made/pipeline/valve": {"icon": "temaki-wheel", "geometry": ["vertex"], "fields": ["ref", "operator", "valve", "location", "diameter"], "moreFields": ["colour", "manufacturer", "material"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"pipeline": "valve"}, "name": "Pipeline Valve"},
-    "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
-    "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
+    "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "moreFields": ["gnis/feature_id"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
+    "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
     "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
     "man_made/storage_tank/water": {"icon": "temaki-storage_tank", "geometry": ["point", "area"], "terms": ["cistern", "water tower"], "tags": {"man_made": "storage_tank", "content": "water"}, "name": "Water Tank"},
     "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "utility_semi", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"},
@@ -764,29 +764,29 @@
     "man_made/surveillance/camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "moreFields": ["manufacturer"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
     "man_made/survey_point": {"icon": "maki-monument", "fields": ["ref"], "geometry": ["point", "vertex"], "terms": ["trig point", "triangulation pillar", "trigonometrical station"], "tags": {"man_made": "survey_point"}, "name": "Survey Point"},
     "man_made/torii": {"icon": "temaki-shinto", "fields": ["height", "material", "colour", "lit"], "moreFields": ["name", "operator", "ref"], "geometry": ["point", "vertex", "line"], "terms": ["Japanese gate", "Shinto shrine"], "tags": {"man_made": "torii"}, "name": "Torii"},
-    "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"},
+    "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect", "gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"},
     "man_made/tower/bell_tower": {"icon": "fas-bell", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["belfry", "bell gable", "campanile", "church tower", "klockstapel"], "tags": {"man_made": "tower", "tower:type": "bell_tower"}, "reference": {"key": "tower:type", "value": "bell_tower"}, "name": "Bell Tower"},
     "man_made/tower/communication": {"icon": "temaki-tower_communication", "fields": ["{man_made/tower}", "communication_multi"], "geometry": ["point", "area"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"},
     "man_made/tower/defensive": {"icon": "maki-castle", "geometry": ["point", "area"], "tags": {"man_made": "tower", "tower:type": "defensive"}, "reference": {"key": "tower:type", "value": "defensive"}, "terms": ["Defensive Tower", "Castle Tower"], "name": "Fortified Tower"},
     "man_made/tower/minaret": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"},
     "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"},
-    "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel Area"},
+    "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "moreFields": ["gnis/feature_id"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel Area"},
     "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "utility_semi", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"},
-    "man_made/wastewater_plant": {"icon": "temaki-waste", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
+    "man_made/wastewater_plant": {"icon": "temaki-waste", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
     "man_made/water_tap": {"icon": "maki-drinking-water", "fields": ["ref", "operator", "drinking_water", "access_simple"], "geometry": ["point", "vertex"], "tags": {"man_made": "water_tap"}, "terms": ["drinking water", "water faucet", "water point", "water source", "water spigot"], "name": "Water Tap"},
-    "man_made/water_tower": {"icon": "temaki-water_tower", "fields": ["operator", "height"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
-    "man_made/water_well": {"icon": "maki-water", "fields": ["ref", "operator", "drinking_water", "pump", "access_simple"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "terms": ["aquifer", "drinking water", "water point", "water source"], "name": "Water Well"},
-    "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"},
-    "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
-    "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
-    "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
+    "man_made/water_tower": {"icon": "temaki-water_tower", "fields": ["operator", "height"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
+    "man_made/water_well": {"icon": "maki-water", "fields": ["ref", "operator", "drinking_water", "pump", "access_simple"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "terms": ["aquifer", "drinking water", "water point", "water source"], "name": "Water Well"},
+    "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"},
+    "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
+    "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
+    "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
     "marker": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "utility_semi", "inscription", "colour"], "moreFields": ["height", "location", "manufacturer", "material"], "geometry": ["point"], "terms": ["identifier", "marking", "plate", "pole", "post", "sign"], "tags": {"marker": "*"}, "name": "Marker"},
     "marker/utility": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "{marker}"], "geometry": ["point"], "terms": ["gas line marker", "identifier", "marking", "oil marker", "pipline marker", "plate", "pole", "post", "sign"], "tags": {"marker": "*", "utility": "*"}, "name": "Utility Marker"},
     "marker/utility/power": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "{marker}"], "geometry": ["point"], "terms": ["electric line", "identifier", "marking", "plate", "pole", "post", "power cable", "power line", "sign"], "tags": {"marker": "*", "utility": "power"}, "name": "Power Marker"},
-    "military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"},
+    "military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"},
     "military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"},
-    "military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"},
-    "military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "moreFields": ["level"], "geometry": ["point", "area"], "tags": {"military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"},
+    "military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"},
+    "military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "moreFields": ["gnis/feature_id", "level"], "geometry": ["point", "area"], "tags": {"military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"},
     "military/trench": {"icon": "temaki-military", "fields": ["name", "trench"], "geometry": ["point", "line"], "tags": {"military": "trench"}, "terms": ["dugout", "firestep", "fox hole", "infantry trench", "war trench"], "name": "Military Trench"},
     "natural/bare_rock": {"geometry": ["area"], "tags": {"natural": "bare_rock"}, "terms": ["rock"], "name": "Bare Rock"},
     "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "line", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"},
@@ -815,7 +815,7 @@
     "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation", "diameter"], "moreFields": ["species/wikidata"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"},
     "natural/valley": {"icon": "maki-triangle-stroked", "fields": ["name", "elevation", "description"], "geometry": ["vertex", "point", "line"], "tags": {"natural": "valley"}, "terms": ["canyon", "dale", "dell", "dene", "depression", "glen", "gorge", "gully", "gulley", "gultch", "hollow", "ravine", "rift", "vale"], "name": "Valley"},
     "natural/volcano": {"icon": "maki-volcano", "fields": ["name", "elevation", "volcano/status", "volcano/type"], "geometry": ["point", "vertex"], "tags": {"natural": "volcano"}, "terms": ["mountain", "crater"], "name": "Volcano"},
-    "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
+    "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "moreFields": ["fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
     "natural/water/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"natural": "water", "water": "basin"}, "reference": {"key": "water", "value": "basin"}, "terms": ["detention", "drain", "overflow", "rain", "retention"], "name": "Basin"},
     "natural/water/canal": {"icon": "iD-waterway-canal", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal Area"},
     "natural/water/lake": {"icon": "maki-water", "fields": ["{natural/water}", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "water", "value": "lake"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"},
@@ -829,7 +829,7 @@
     "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "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", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "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", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "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},
@@ -886,21 +886,21 @@
     "piste/skitour": {"icon": "fas-skiing-nordic", "fields": ["name", "piste/type", "piste/difficulty_skitour", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "skitour", "crosscountry", "ski touring", "piste"], "tags": {"piste:type": "skitour"}, "name": "Ski Touring Trail"},
     "piste/sled": {"icon": "temaki-sledding", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "sled", "luge", "sleigh", "sledge", "piste"], "tags": {"piste:type": "sled"}, "name": "Sled Piste"},
     "piste/sleigh": {"icon": "fas-sleigh", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "piste", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse"], "tags": {"piste:type": "sleigh"}, "name": "Sleigh Piste"},
-    "place/farm": {"icon": "maki-farm", "geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "farm"}, "name": "Farm", "searchable": false},
-    "place/city_block": {"icon": "maki-triangle-stroked", "fields": ["name"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "city_block"}, "name": "City Block"},
-    "place/city": {"icon": "maki-city", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"},
-    "place/hamlet": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "hamlet"}, "name": "Hamlet"},
-    "place/island": {"icon": "maki-mountain", "geometry": ["point", "area"], "fields": ["name"], "terms": ["archipelago", "atoll", "bar", "cay", "isle", "islet", "key", "reef"], "tags": {"place": "island"}, "name": "Island"},
-    "place/islet": {"icon": "maki-mountain", "geometry": ["point", "area"], "fields": ["name"], "terms": ["archipelago", "atoll", "bar", "cay", "isle", "islet", "key", "reef"], "tags": {"place": "islet"}, "name": "Islet"},
-    "place/isolated_dwelling": {"icon": "maki-home", "geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "isolated_dwelling"}, "name": "Isolated Dwelling"},
-    "place/locality": {"icon": "maki-triangle-stroked", "geometry": ["point", "area"], "moreFields": ["website"], "fields": ["name"], "tags": {"place": "locality"}, "name": "Locality"},
-    "place/neighbourhood": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "neighbourhood"}, "terms": ["neighbourhood"], "name": "Neighborhood"},
-    "place/plot": {"icon": "maki-triangle-stroked", "fields": ["name"], "geometry": ["point", "area"], "tags": {"place": "plot"}, "terms": ["tract", "land", "lot", "parcel"], "name": "Plot"},
-    "place/quarter": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "quarter"}, "terms": ["boro", "borough", "quarter"], "name": "Sub-Borough / Quarter"},
-    "place/square": {"icon": "temaki-pedestrian", "geometry": ["point", "area"], "fields": ["name"], "moreFields": ["website"], "tags": {"place": "square"}, "name": "Square"},
-    "place/suburb": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "suburb"}, "terms": ["boro", "borough", "quarter"], "name": "Borough / Suburb"},
-    "place/town": {"icon": "maki-town", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "town"}, "name": "Town"},
-    "place/village": {"icon": "maki-village", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "village"}, "name": "Village"},
+    "place/farm": {"icon": "maki-farm", "geometry": ["point", "area"], "tags": {"place": "farm"}, "name": "Farm", "searchable": false},
+    "place/city_block": {"icon": "maki-triangle-stroked", "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "city_block"}, "name": "City Block"},
+    "place/city": {"icon": "maki-city", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"},
+    "place/hamlet": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "hamlet"}, "name": "Hamlet"},
+    "place/island": {"icon": "maki-mountain", "geometry": ["point", "area"], "terms": ["archipelago", "atoll", "bar", "cay", "isle", "islet", "key", "reef"], "tags": {"place": "island"}, "name": "Island"},
+    "place/islet": {"icon": "maki-mountain", "geometry": ["point", "area"], "terms": ["archipelago", "atoll", "bar", "cay", "isle", "islet", "key", "reef"], "tags": {"place": "islet"}, "name": "Islet"},
+    "place/isolated_dwelling": {"icon": "maki-home", "geometry": ["point", "area"], "tags": {"place": "isolated_dwelling"}, "name": "Isolated Dwelling"},
+    "place/locality": {"icon": "maki-triangle-stroked", "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "locality"}, "name": "Locality"},
+    "place/neighbourhood": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["gnis/feature_id", "website"], "geometry": ["point", "area"], "tags": {"place": "neighbourhood"}, "terms": ["neighbourhood"], "name": "Neighborhood"},
+    "place/plot": {"icon": "maki-triangle-stroked", "geometry": ["point", "area"], "tags": {"place": "plot"}, "terms": ["tract", "land", "lot", "parcel"], "name": "Plot"},
+    "place/quarter": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "quarter"}, "terms": ["boro", "borough", "quarter"], "name": "Sub-Borough / Quarter"},
+    "place/square": {"icon": "temaki-pedestrian", "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "square"}, "name": "Square"},
+    "place/suburb": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "suburb"}, "terms": ["boro", "borough", "quarter"], "name": "Borough / Suburb"},
+    "place/town": {"icon": "maki-town", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "town"}, "name": "Town"},
+    "place/village": {"icon": "maki-village", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "village"}, "name": "Village"},
     "playground/balance_beam": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "balancebeam"}, "name": "Play Balance Beam"},
     "playground/basket_spinner": {"icon": "maki-playground", "geometry": ["point"], "terms": ["basket rotator"], "tags": {"playground": "basketrotator"}, "name": "Basket Spinner"},
     "playground/basket_swing": {"icon": "maki-playground", "geometry": ["point"], "tags": {"playground": "basketswing"}, "name": "Basket Swing"},
@@ -926,13 +926,13 @@
     "power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/type", "generator/output/electricity", "height", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"},
     "power/line": {"icon": "temaki-power_tower", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "terms": ["electric power transmission line", "high voltage line", "high tension line"], "tags": {"power": "line"}, "name": "Power Line"},
     "power/minor_line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "minor_line"}, "name": "Minor Power Line"},
-    "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"},
+    "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "moreFields": ["gnis/feature_id"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"},
     "power/pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
-    "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"},
+    "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"},
     "power/switch": {"icon": "temaki-power_switch", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"},
     "power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"},
     "power/transformer": {"icon": "temaki-power_transformer", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex"], "tags": {"power": "transformer"}, "name": "Transformer"},
-    "public_transport/platform_point": {"icon": "maki-rail", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "level", "lit", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6},
+    "public_transport/platform_point": {"icon": "maki-rail", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "gnis/feature_id", "level", "lit", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6},
     "public_transport/platform": {"icon": "temaki-pedestrian", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "level", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6},
     "public_transport/platform/aerialway_point": {"icon": "maki-aerialway", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "searchable": false, "name": "Aerialway Stop / Platform"},
     "public_transport/platform/ferry_point": {"icon": "maki-ferry", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "searchable": false, "name": "Ferry Stop / Platform"},
@@ -962,7 +962,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", "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", "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"},
@@ -1007,7 +1007,7 @@
     "seamark/buoy_lateral/green": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"},
     "seamark/buoy_lateral/red": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"},
     "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"},
-    "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "currency_multi", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "phone", "second_hand", "stroller", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
+    "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "currency_multi", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "phone", "second_hand", "stroller", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
     "shop/boutique": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "boutique"}, "searchable": false, "name": "Boutique"},
     "shop/fashion": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion"}, "searchable": false, "name": "Fashion Store"},
     "shop/fishmonger": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false},
@@ -1167,10 +1167,10 @@
     "shop/wholesale": {"icon": "maki-warehouse", "fields": ["{shop}", "wholesale"], "geometry": ["point", "area"], "terms": ["warehouse club", "cash and carry"], "tags": {"shop": "wholesale"}, "name": "Wholesale Store"},
     "shop/window_blind": {"icon": "temaki-window", "geometry": ["point", "area"], "tags": {"shop": "window_blind"}, "name": "Window Blind Store"},
     "shop/wine": {"icon": "maki-alcohol-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"},
-    "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"},
-    "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"},
+    "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"},
+    "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"},
     "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "level", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"},
-    "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
+    "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
     "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["level", "material", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"},
     "tourism/artwork/bust": {"icon": "fas-user-alt", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex"], "tags": {"tourism": "artwork", "artwork_type": "bust"}, "reference": {"key": "artwork_type"}, "terms": ["figure"], "name": "Bust"},
     "tourism/artwork/graffiti": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "graffiti"}, "reference": {"key": "artwork_type"}, "terms": ["Street Artwork", "Guerilla Artwork", "Graffiti Artwork"], "name": "Graffiti"},
@@ -1178,30 +1178,30 @@
     "tourism/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "reference": {"key": "artwork_type", "value": "mural"}, "terms": ["fresco", "wall painting"], "name": "Mural"},
     "tourism/artwork/sculpture": {"icon": "temaki-sculpture", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "reference": {"key": "artwork_type", "value": "sculpture"}, "terms": ["statue", "figure", "carving"], "name": "Sculpture"},
     "tourism/artwork/statue": {"icon": "fas-female", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"},
-    "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "attraction"}, "matchScore": 0.75, "name": "Tourist Attraction"},
+    "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "attraction"}, "matchScore": 0.75, "name": "Tourist Attraction"},
     "tourism/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_pitch"}, "name": "Camp Pitch"},
-    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "power_supply", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
-    "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access/ssid", "operator", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
-    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
-    "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
-    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "guest_house", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
+    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "power_supply", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
+    "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access/ssid", "operator", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
+    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
+    "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
+    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "guest_house", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
     "tourism/hostel": {"icon": "maki-lodging", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"},
     "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "bar", "stars"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
     "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "moreFields": ["level"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"},
     "tourism/information/board": {"icon": "maki-information", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"},
     "tourism/information/guidepost": {"icon": "fas-map-signs", "fields": ["name", "elevation", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"},
     "tourism/information/map": {"icon": "fas-map", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"},
-    "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
+    "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
     "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", "building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "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", "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/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "fee", "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", "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", "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},
+    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "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/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},
     "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "moreFields": ["level"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
-    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
-    "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
+    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
+    "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
     "tourism/zoo/petting": {"icon": "fas-horse", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "petting_zoo"}, "reference": {"key": "zoo", "value": "petting_zoo"}, "terms": ["Children's Zoo", "Children's Farm", "Petting Farm", "farm animals"], "name": "Petting Zoo"},
     "tourism/zoo/safari": {"icon": "temaki-zoo", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "safari_park"}, "reference": {"key": "zoo", "value": "safari_park"}, "terms": ["Drive-Through Zoo", "Drive-In Zoo"], "name": "Safari Park"},
     "tourism/zoo/wildlife": {"icon": "fas-frog", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "wildlife_park"}, "reference": {"key": "zoo", "value": "wildlife_park"}, "terms": ["indigenous animals"], "name": "Wildlife Park"},
@@ -1223,7 +1223,7 @@
     "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "maxspeed"], "geometry": ["point"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
     "type/multipolygon": {"icon": "iD-multipolygon", "geometry": ["area", "relation"], "tags": {"type": "multipolygon"}, "removeTags": {}, "name": "Multipolygon", "searchable": false, "matchScore": 0.1},
     "type/boundary": {"icon": "iD-boundary", "fields": ["name", "boundary"], "geometry": ["relation"], "tags": {"type": "boundary"}, "name": "Boundary"},
-    "type/boundary/administrative": {"icon": "iD-boundary", "fields": ["name", "admin_level"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"},
+    "type/boundary/administrative": {"icon": "iD-boundary", "fields": ["name", "admin_level"], "moreFields": ["gnis/feature_id"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"},
     "type/enforcement": {"icon": "iD-relation", "fields": ["name", "enforcement"], "geometry": ["relation"], "tags": {"type": "enforcement"}, "name": "Enforcement"},
     "type/public_transport/stop_area_group": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area_group"}, "reference": {"key": "public_transport", "value": "stop_area_group"}, "name": "Transit Stop Area Group"},
     "type/restriction": {"icon": "iD-restriction", "fields": ["restriction", "except"], "geometry": ["relation"], "tags": {"type": "restriction"}, "name": "Restriction"},
@@ -1256,23 +1256,23 @@
     "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
     "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
-    "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
-    "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "structure_waterway", "width", "intermittent", "lock"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
-    "waterway/canal/lock": {"icon": "iD-waterway-canal", "fields": ["name", "width", "lock"], "moreFields": ["intermittent", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal", "lock": "yes"}, "name": "Canal Lock"},
-    "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name", "operator", "height", "material"], "moreFields": ["seamark/type", "website"], "tags": {"waterway": "dam"}, "name": "Dam"},
+    "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
+    "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "structure_waterway", "width", "intermittent", "lock"], "moreFields": ["fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
+    "waterway/canal/lock": {"icon": "iD-waterway-canal", "fields": ["name", "width", "lock"], "moreFields": ["gnis/feature_id", "intermittent", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal", "lock": "yes"}, "name": "Canal Lock"},
+    "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name", "operator", "gnis/feature_id", "height", "material"], "moreFields": ["seamark/type", "website"], "tags": {"waterway": "dam"}, "name": "Dam"},
     "waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["{waterway/drain}"], "moreFields": ["{waterway/drain}"], "geometry": ["line"], "tags": {"waterway": "ditch"}, "name": "Ditch"},
     "waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "ship", "vessel", "marine"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"},
     "waterway/drain": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"},
     "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["brand", "building", "email", "fax", "payment_multi", "phone", "seamark/type", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
     "waterway/lock_gate": {"icon": "maki-dam", "geometry": ["vertex", "line"], "fields": ["name", "ref", "height", "material"], "tags": {"waterway": "lock_gate"}, "addTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "terms": ["canal"], "name": "Lock Gate"},
     "waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"},
-    "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["covered", "fishing", "salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
+    "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["covered", "fishing", "gnis/feature_id", "salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
     "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"},
     "waterway/stream_intermittent": {"icon": "iD-waterway-stream", "fields": ["{waterway/stream}"], "moreFields": ["{waterway/stream}"], "geometry": ["line"], "terms": ["arroyo", "beck", "branch", "brook", "burn", "course", "creek", "drift", "flood", "flow", "gully", "run", "runnel", "rush", "spate", "spritz", "tributary", "wadi", "wash", "watercourse"], "tags": {"waterway": "stream", "intermittent": "yes"}, "reference": {"key": "waterway", "value": "stream"}, "name": "Intermittent Stream"},
-    "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["covered", "fishing", "salt", "tidal"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"},
+    "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["covered", "fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"},
     "waterway/water_point": {"icon": "maki-drinking-water", "fields": ["{amenity/water_point}"], "moreFields": ["{amenity/water_point}"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "Marine Drinking Water"},
-    "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
-    "waterway/weir": {"icon": "maki-dam", "fields": ["name", "operator", "height", "material"], "moreFields": ["seamark/type"], "geometry": ["vertex", "line"], "terms": ["low-head dam", "low-rise dam", "wier"], "tags": {"waterway": "weir"}, "name": "Weir"},
+    "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "moreFields": ["gnis/feature_id"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
+    "waterway/weir": {"icon": "maki-dam", "fields": ["name", "operator", "height", "material"], "moreFields": ["gnis/feature_id", "seamark/type"], "geometry": ["vertex", "line"], "terms": ["low-head dam", "low-rise dam", "wier"], "tags": {"waterway": "weir"}, "name": "Weir"},
     "amenity/animal_boarding/PetsHotel": {"name": "PetsHotel", "icon": "maki-veterinary", "imageURL": "https://graph.facebook.com/PetSmart/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q67141961", "amenity": "animal_boarding"}, "addTags": {"amenity": "animal_boarding", "animal_boarding": "dog;cat", "brand": "PetsHotel", "brand:wikidata": "Q67141961", "name": "PetsHotel"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bank/ABANCA": {"name": "ABANCA", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/SomosAbanca/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9598744", "amenity": "bank"}, "addTags": {"amenity": "bank", "brand": "ABANCA", "brand:wikidata": "Q9598744", "brand:wikipedia": "es:Abanca", "name": "ABANCA", "official_name": "ABANCA Corporación Bancaria"}, "countryCodes": ["es"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bank/ABN AMRO": {"name": "ABN AMRO", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/abnamro/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q287471", "amenity": "bank"}, "addTags": {"amenity": "bank", "brand": "ABN AMRO", "brand:wikidata": "Q287471", "brand:wikipedia": "en:ABN AMRO", "name": "ABN AMRO", "official_name": "ABN AMRO Bank N.V."}, "countryCodes": ["nl"], "terms": [], "matchScore": 2, "suggestion": true},

data/presets/presets/_natural.json

@@ -4,6 +4,9 @@
         "name",
         "natural"
     ],
+    "moreFields": [
+        "gnis/feature_id"
+    ],
     "geometry": [
         "point",
         "vertex",

data/presets/presets/_place.json

@@ -3,6 +3,9 @@
         "name",
         "place"
     ],
+    "moreFields": [
+        "gnis/feature_id"
+    ],
     "geometry": [
         "point",
         "vertex",

data/presets/presets/aeroway/aerodrome.json

@@ -13,6 +13,9 @@
         "internet_access/fee",
         "internet_access/ssid"
     ],
+    "moreFields": [
+        "gnis/feature_id"
+    ],
     "terms": [
         "aerodrome",
         "aeroway",

data/presets/presets/amenity/animal_boarding.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/animal_breeding.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "phone",
         "website",

data/presets/presets/amenity/animal_shelter.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "phone",
         "website",

data/presets/presets/amenity/arts_centre.json

@@ -12,6 +12,7 @@
         "email",
         "fax",
         "fee",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/bank.json

@@ -13,6 +13,7 @@
         "currency_multi",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/bar.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/cafe.json

@@ -17,6 +17,7 @@
         "diet_multi",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access/ssid",
         "level",
         "min_age",

data/presets/presets/amenity/car_wash.json

@@ -12,6 +12,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/amenity/casino.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/childcare.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "max_age",
         "min_age",

data/presets/presets/amenity/cinema.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "min_age",
         "phone",

data/presets/presets/amenity/clinic.json

@@ -13,6 +13,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/college.json

@@ -13,6 +13,7 @@
         "denomination",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access/ssid",
         "phone",
         "religion",

data/presets/presets/amenity/community_centre.json

@@ -10,6 +10,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "polling_station",
         "website",

data/presets/presets/amenity/conference_centre.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access/fee",
         "internet_access/ssid",
         "phone",

data/presets/presets/amenity/courthouse.json

@@ -9,6 +9,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "phone",
         "polling_station",

data/presets/presets/amenity/crematorium.json

@@ -11,6 +11,7 @@
         "address",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "phone",
         "website",

data/presets/presets/amenity/dentist.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/dive_centre.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/doctors.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/dojo.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/driving_school.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/events_venue.json

@@ -14,6 +14,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "min_age",
         "phone",

data/presets/presets/amenity/fast_food.json

@@ -15,6 +15,7 @@
         "diet_multi",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/fire_station.json

@@ -9,6 +9,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "polling_station",
         "smoking",

data/presets/presets/amenity/food_court.json

@@ -12,6 +12,7 @@
         "diet_multi",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/fuel.json

@@ -12,6 +12,7 @@
         "building",
         "email",
         "fax",
+        "gnis/feature_id",
         "opening_hours",
         "payment_multi",
         "phone",

data/presets/presets/amenity/grave_yard.json

@@ -7,6 +7,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "website"
     ],

data/presets/presets/amenity/hospital.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/ice_cream.json

@@ -13,6 +13,7 @@
         "drive_through",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/internet_cafe.json

@@ -14,6 +14,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "min_age",
         "opening_hours",

data/presets/presets/amenity/karaoke.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "min_age",
         "payment_multi",

data/presets/presets/amenity/kindergarten.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "max_age",
         "min_age",

data/presets/presets/amenity/language_school.json

@@ -12,6 +12,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/library.json

@@ -16,6 +16,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "opening_hours",
         "payment_multi",

data/presets/presets/amenity/love_hotel.json

@@ -13,6 +13,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "min_age",
         "payment_multi",
         "phone",

data/presets/presets/amenity/marketplace.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/amenity/monastery.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/amenity/music_school.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/nightclub.json

@@ -13,6 +13,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/pharmacy.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "opening_hours",
         "payment_multi",

data/presets/presets/amenity/place_of_worship.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/ssid",
         "level",

data/presets/presets/amenity/planetarium.json

@@ -13,6 +13,7 @@
         "email",
         "fax",
         "fee",
+        "gnis/feature_id",
         "payment_multi_fee",
         "phone",
         "website",

data/presets/presets/amenity/police.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "phone",
         "polling_station",

data/presets/presets/amenity/polling_station.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/post_box.json

@@ -10,6 +10,7 @@
         "access_simple",
         "brand",
         "covered",
+        "gnis/feature_id",
         "height",
         "indoor",
         "level",

data/presets/presets/amenity/post_depot.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "opening_hours",
         "website",
         "wheelchair"

data/presets/presets/amenity/post_office.json

@@ -11,6 +11,7 @@
         "brand",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/prep_school.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "payment_multi",
         "phone",

data/presets/presets/amenity/prison.json

@@ -9,6 +9,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/amenity/pub.json

@@ -13,6 +13,7 @@
         "diet_multi",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/public_bath.json

@@ -13,6 +13,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/ranger_station.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/research_institute.json

@@ -12,6 +12,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access/ssid",
         "phone",
         "wheelchair"

data/presets/presets/amenity/restaurant.json

@@ -17,6 +17,7 @@
         "diet_multi",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/school.json

@@ -14,6 +14,7 @@
         "email",
         "fax",
         "fee",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/ssid",
         "level",

data/presets/presets/amenity/shelter.json

@@ -8,6 +8,7 @@
         "bin"
     ],
     "moreFields": [
+        "gnis/feature_id",
         "lit",
         "lockable",
         "wheelchair"

data/presets/presets/amenity/social_centre.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/social_facility.json

@@ -12,6 +12,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/studio.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/theatre.json

@@ -11,6 +11,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",

data/presets/presets/amenity/townhall.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "polling_station",
         "smoking",

data/presets/presets/amenity/vehicle_inspection.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "payment_multi",
         "phone",
         "website",

data/presets/presets/amenity/veterinary.json

@@ -12,6 +12,7 @@
         "email",
         "fax",
         "fee",
+        "gnis/feature_id",
         "level",
         "payment_multi_fee",
         "phone",

data/presets/presets/building.json

@@ -11,6 +11,7 @@
         "architect",
         "building/levels/underground",
         "building/material",
+        "gnis/feature_id",
         "layer",
         "not/name",
         "operator",

data/presets/presets/club.json

@@ -13,6 +13,7 @@
         "building/levels_building",
         "email",
         "fax",
+        "gnis/feature_id",
         "height_building",
         "internet_access",
         "internet_access/fee",

data/presets/presets/craft.json

@@ -13,6 +13,7 @@
         "building/levels_building",
         "email",
         "fax",
+        "gnis/feature_id",
         "height_building",
         "internet_access",
         "internet_access/fee",

data/presets/presets/emergency/ambulance_station.json

@@ -9,6 +9,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/ford.json

@@ -5,6 +5,9 @@
         "access",
         "seasonal"
     ],
+    "moreFields": [
+        "gnis/feature_id"
+    ],
     "geometry": [
         "vertex"
     ],

data/presets/presets/healthcare.json

@@ -13,6 +13,7 @@
         "building/levels_building",
         "email",
         "fax",
+        "gnis/feature_id",
         "height_building",
         "level",
         "opening_hours",

data/presets/presets/highway/path.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "covered",
         "dog",
+        "gnis/feature_id",
         "horse_scale",
         "informal",
         "lit",

data/presets/presets/highway/trailhead.json

@@ -11,6 +11,7 @@
         "charge_fee"
     ],
     "moreFields": [
+        "gnis/feature_id",
         "opening_hours"
     ],
     "geometry": [

data/presets/presets/historic.json

@@ -4,6 +4,9 @@
         "historic",
         "inscription"
     ],
+    "moreFields": [
+        "gnis/feature_id"
+    ],
     "geometry": [
         "point",
         "vertex",

data/presets/presets/historic/boundary_stone.json

@@ -5,6 +5,7 @@
         "inscription"
     ],
     "moreFields": [
+        "{historic}",
         "material"
     ],
     "geometry": [

data/presets/presets/historic/memorial.json

@@ -7,6 +7,7 @@
         "material"
     ],
     "moreFields": [
+        "{historic}",
         "website"
     ],
     "geometry": [

data/presets/presets/historic/monument.json

@@ -6,6 +6,7 @@
         "access_simple"
     ],
     "moreFields": [
+        "{historic}",
         "material"
     ],
     "geometry": [

data/presets/presets/historic/wayside_cross.json

@@ -5,6 +5,7 @@
         "inscription"
     ],
     "moreFields": [
+        "{historic}",
         "material"
     ],
     "geometry": [

data/presets/presets/historic/wreck.json

@@ -9,6 +9,7 @@
         "historic/wreck/visible_at_high_tide"
     ],
     "moreFields": [
+        "{historic}",
         "seamark/type"
     ],
     "geometry": [

data/presets/presets/leisure/amusement_arcade.json

@@ -10,6 +10,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "max_age",
         "min_age",

data/presets/presets/leisure/bandstand.json

@@ -6,6 +6,7 @@
         "operator"
     ],
     "moreFields": [
+        "gnis/feature_id",
         "website"
     ],
     "geometry": [

data/presets/presets/leisure/beach_resort.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "smoking",
         "website"

data/presets/presets/leisure/bowling_alley.json

@@ -10,6 +10,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "min_age",
         "opening_hours",

data/presets/presets/leisure/common.json

@@ -1,9 +1,11 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
-        "name"
+        "name",
+        "access_simple"
     ],
     "moreFields": [
+        "gnis/feature_id",
         "website"
     ],
     "geometry": [

data/presets/presets/leisure/dance.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "opening_hours",
         "payment_multi",

data/presets/presets/leisure/dancing_school.json

@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "level",
         "opening_hours",
         "payment_multi",

data/presets/presets/leisure/disc_golf_course.json

@@ -14,6 +14,7 @@
         "dog",
         "email",
         "fax",
+        "gnis/feature_id",
         "lit",
         "phone",
         "website",

data/presets/presets/leisure/dog_park.json

@@ -6,6 +6,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "website"
     ],

data/presets/presets/leisure/fitness_centre.json

@@ -11,6 +11,7 @@
         "email",
         "fax",
         "fee",
+        "gnis/feature_id",
         "opening_hours",
         "payment_multi",
         "phone",

data/presets/presets/leisure/garden.json

@@ -11,6 +11,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "phone",
         "website"
     ],

data/presets/presets/leisure/golf_course.json

@@ -9,6 +9,7 @@
     "moreFields": [
         "email",
         "fax",
+        "gnis/feature_id",
         "payment_multi",
         "phone",
         "website"