Removed the address, email, fax, phone, and website fields from the universal field list (re: #5719)

Added those fields to the moreFields list of relevant presets

data/presets/fields.json

@@ -2,7 +2,7 @@
   "fields": {
     "access_simple": {"key": "access", "type": "combo", "label": "Allowed Access", "options": ["yes", "permissive", "private", "customers", "permit", "no"]},
     "access": {"keys": ["access", "foot", "motor_vehicle", "bicycle", "horse"], "reference": {"key": "access"}, "type": "access", "label": "Allowed Access", "placeholder": "Not Specified", "strings": {"types": {"access": "All", "foot": "Foot", "motor_vehicle": "Motor Vehicles", "bicycle": "Bicycles", "horse": "Horses"}, "options": {"yes": {"title": "Allowed", "description": "Access allowed by law; a right of way"}, "no": {"title": "Prohibited", "description": "Access not allowed to the general public"}, "permissive": {"title": "Permissive", "description": "Access allowed until such time as the owner revokes the permission"}, "private": {"title": "Private", "description": "Access allowed only with permission of the owner on an individual basis"}, "designated": {"title": "Designated", "description": "Access allowed according to signs or specific local laws"}, "destination": {"title": "Destination", "description": "Access allowed only to reach a destination"}, "dismount": {"title": "Dismount", "description": "Access allowed but rider must dismount"}, "permit": {"title": "Permit", "description": "Access allowed only with a valid permit or license"}}}},
-    "address": {"type": "address", "keys": ["addr:block_number", "addr:city", "addr:block_number", "addr:conscriptionnumber", "addr:county", "addr:country", "addr:county", "addr:district", "addr:floor", "addr:hamlet", "addr:housename", "addr:housenumber", "addr:neighbourhood", "addr:place", "addr:postcode", "addr:province", "addr:quarter", "addr:state", "addr:street", "addr:subdistrict", "addr:suburb", "addr:unit"], "reference": {"key": "addr"}, "icon": "address", "universal": true, "label": "Address", "strings": {"placeholders": {"block_number": "Block Number", "block_number!jp": "Block No.", "city": "City", "city!jp": "City/Town/Village/Tokyo Special Ward", "city!vn": "City/Town", "conscriptionnumber": "123", "country": "Country", "county": "County", "county!jp": "District", "district": "District", "district!vn": "Arrondissement/Town/District", "floor": "Floor", "hamlet": "Hamlet", "housename": "Housename", "housenumber": "123", "housenumber!jp": "Building No./Lot No.", "neighbourhood": "Neighbourhood", "neighbourhood!jp": "Chōme/Aza/Koaza", "place": "Place", "postcode": "Postcode", "province": "Province", "province!jp": "Prefecture", "quarter": "Quarter", "quarter!jp": "Ōaza/Machi", "state": "State", "street": "Street", "subdistrict": "Subdistrict", "subdistrict!vn": "Ward/Commune/Townlet", "suburb": "Suburb", "suburb!jp": "Ward", "unit": "Unit"}}},
+    "address": {"type": "address", "keys": ["addr:block_number", "addr:city", "addr:block_number", "addr:conscriptionnumber", "addr:county", "addr:country", "addr:county", "addr:district", "addr:floor", "addr:hamlet", "addr:housename", "addr:housenumber", "addr:neighbourhood", "addr:place", "addr:postcode", "addr:province", "addr:quarter", "addr:state", "addr:street", "addr:subdistrict", "addr:suburb", "addr:unit"], "reference": {"key": "addr"}, "icon": "address", "label": "Address", "strings": {"placeholders": {"block_number": "Block Number", "block_number!jp": "Block No.", "city": "City", "city!jp": "City/Town/Village/Tokyo Special Ward", "city!vn": "City/Town", "conscriptionnumber": "123", "country": "Country", "county": "County", "county!jp": "District", "district": "District", "district!vn": "Arrondissement/Town/District", "floor": "Floor", "hamlet": "Hamlet", "housename": "Housename", "housenumber": "123", "housenumber!jp": "Building No./Lot No.", "neighbourhood": "Neighbourhood", "neighbourhood!jp": "Chōme/Aza/Koaza", "place": "Place", "postcode": "Postcode", "province": "Province", "province!jp": "Prefecture", "quarter": "Quarter", "quarter!jp": "Ōaza/Machi", "state": "State", "street": "Street", "subdistrict": "Subdistrict", "subdistrict!vn": "Ward/Commune/Townlet", "suburb": "Suburb", "suburb!jp": "Ward", "unit": "Unit"}}},
     "admin_level": {"key": "admin_level", "type": "number", "minValue": 1, "label": "Admin Level"},
     "aerialway": {"key": "aerialway", "type": "typeCombo", "label": "Type"},
     "aerialway/access": {"key": "aerialway:access", "type": "combo", "label": "Access", "strings": {"options": {"entry": "Entry", "exit": "Exit", "both": "Both"}}},
@@ -98,14 +98,14 @@
     "duration": {"key": "duration", "type": "text", "label": "Duration", "placeholder": "00:00"},
     "electrified": {"key": "electrified", "type": "combo", "label": "Electrification", "placeholder": "Contact Line, Electrified Rail...", "strings": {"options": {"contact_line": "Contact Line", "rail": "Electrified Rail", "yes": "Yes (unspecified)", "no": "No"}}},
     "elevation": {"key": "ele", "type": "number", "icon": "elevation", "universal": true, "label": "Elevation"},
-    "email": {"key": "email", "type": "email", "placeholder": "example@example.com", "universal": true, "label": "Email"},
+    "email": {"key": "email", "type": "email", "placeholder": "example@example.com", "label": "Email"},
     "embankment": {"key": "embankment", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
     "emergency": {"key": "emergency", "type": "check", "label": "Emergency"},
     "enforcement": {"key": "enforcement", "type": "combo", "label": "Type"},
     "entrance": {"key": "entrance", "type": "typeCombo", "label": "Type"},
     "except": {"key": "except", "type": "combo", "label": "Exceptions"},
     "faces": {"key": "faces", "type": "number", "minValue": 0, "label": "Faces"},
-    "fax": {"key": "fax", "type": "tel", "label": "Fax", "universal": true, "placeholder": "+31 42 123 4567"},
+    "fax": {"key": "fax", "type": "tel", "label": "Fax", "placeholder": "+31 42 123 4567"},
     "fee": {"key": "fee", "type": "check", "label": "Fee"},
     "fence_type": {"key": "fence_type", "type": "combo", "label": "Type"},
     "fire_hydrant/diameter": {"key": "fire_hydrant:diameter", "type": "combo", "label": "Diameter (mm, in, or letters)", "snake_case": false},
@@ -212,7 +212,7 @@
     "passenger_information_display": {"key": "passenger_information_display", "type": "check", "label": "Passenger information display"},
     "payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types"},
     "phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."},
-    "phone": {"key": "phone", "type": "tel", "icon": "maki-telephone", "universal": true, "label": "Telephone", "placeholder": "+31 42 123 4567"},
+    "phone": {"key": "phone", "type": "tel", "icon": "maki-telephone", "label": "Telephone", "placeholder": "+31 42 123 4567"},
     "piste/difficulty_downhill": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
     "piste/difficulty_nordic": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - Flat, no effort needed", "easy": "Easy - Soft hills, short steep section", "intermediate": "Intermediate - Steep section", "advanced": "Advanced - Narrow, steep or icy section, sharp turn", "expert": "Expert - Dangerous terrain around"}}},
     "piste/difficulty_skitour": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - L: <30° incline", "easy": "Easy - WS: 30-35° incline", "intermediate": "Intermediate - ZS: 35-40° incline", "advanced": "Advanced - S: 40-45° incline", "expert": "Expert - SS: 45–50° incline", "freeride": "Freeride - AS: 50–55° incline", "extreme": "Extreme - EX: >55° incline"}}},
@@ -350,7 +350,7 @@
     "water_volume": {"key": "water_volume", "type": "number", "label": "Water Reserve Volume (m³)", "snake_case": false},
     "water": {"key": "water", "type": "combo", "label": "Type"},
     "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"},
-    "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "http://example.com/", "universal": true, "label": "Website"},
+    "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "http://example.com/", "label": "Website"},
     "wetland": {"key": "wetland", "type": "combo", "label": "Type"},
     "wheelchair": {"key": "wheelchair", "type": "radio", "options": ["yes", "limited", "no"], "icon": "maki-wheelchair", "universal": true, "label": "Wheelchair Access"},
     "wholesale": {"key": "wholesale", "type": "typeCombo", "label": "Wholesale"},

data/presets/fields/address.json

@@ -26,7 +26,6 @@
     ],
     "reference": {"key": "addr"},
     "icon": "address",
-    "universal": true,
     "label": "Address",
     "strings": {
         "placeholders": {

data/presets/fields/email.json

@@ -2,6 +2,5 @@
     "key": "email",
     "type": "email",
     "placeholder": "example@example.com",
-    "universal": true,
     "label": "Email"
 }

data/presets/fields/fax.json

@@ -2,6 +2,5 @@
     "key": "fax",
     "type": "tel",
     "label": "Fax",
-    "universal": true,
     "placeholder":"+31 42 123 4567"
 }

data/presets/fields/phone.json

@@ -2,7 +2,6 @@
     "key": "phone",
     "type": "tel",
     "icon": "maki-telephone",
-    "universal": true,
     "label": "Telephone",
     "placeholder": "+31 42 123 4567"
 }

data/presets/fields/website.json

@@ -3,6 +3,5 @@
     "type": "url",
     "icon": "website",
     "placeholder": "http://example.com/",
-    "universal": true,
     "label": "Website"
 }

data/presets/presets.json

@@ -3,7 +3,7 @@
     "aerialway": {"fields": ["aerialway"], "geometry": ["point", "vertex", "line"], "tags": {"aerialway": "*"}, "terms": ["ski lift", "funifor", "funitel"], "searchable": false, "name": "Aerialway"},
     "aeroway": {"icon": "maki-airport", "fields": ["aeroway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"aeroway": "*"}, "searchable": false, "name": "Aeroway"},
     "amenity": {"fields": ["amenity"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "*"}, "searchable": false, "name": "Amenity"},
-    "attraction": {"icon": "maki-star", "fields": ["name", "attraction", "operator", "opening_hours"], "moreFields": ["address", "opening_hours", "fee", "payment_multi"], "geometry": ["point", "vertex", "line", "area"], "tags": {"attraction": "*"}, "searchable": false, "name": "Attraction"},
+    "attraction": {"icon": "maki-star", "fields": ["name", "attraction", "operator", "opening_hours"], "moreFields": ["opening_hours", "fee", "payment_multi", "address", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "line", "area"], "tags": {"attraction": "*"}, "searchable": false, "name": "Attraction"},
     "circular": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "circular"}, "name": "Traffic Circle", "searchable": false},
     "embankment": {"geometry": ["line"], "tags": {"embankment": "yes"}, "name": "Embankment", "matchScore": 0.2, "searchable": false},
     "highway": {"fields": ["name", "highway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"highway": "*"}, "searchable": false, "name": "Highway"},
@@ -45,81 +45,81 @@
     "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": "maki-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": "maki-swimming", "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": ["payment_multi"], "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"], "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"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
-    "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["fee", "payment_multi"], "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": ["payment_multi", "website", "phone", "email", "fax"], "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": ["website", "phone", "email", "fax"], "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": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
+    "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax"], "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"], "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": ["opening_hours", "currency_multi"], "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", "operator", "address", "building_area", "outdoor_seating", "brewery"], "moreFields": ["smoking", "opening_hours", "payment_multi"], "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": ["opening_hours", "currency_multi", "website", "phone", "email", "fax"], "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", "operator", "address", "building_area", "outdoor_seating", "brewery"], "moreFields": ["smoking", "opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "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": ["lit", "access_simple"], "geometry": ["point", "vertex", "line"], "terms": ["seat"], "tags": {"amenity": "bench"}, "name": "Bench"},
     "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "covered", "access_simple", "fee"], "moreFields": ["payment_multi"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
-    "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "fee", "payment_multi"], "moreFields": ["opening_hours"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
+    "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "fee", "payment_multi"], "moreFields": ["opening_hours", "address", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
     "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "service/bicycle"], "moreFields": ["payment_multi"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
-    "amenity/biergarten": {"icon": "maki-beer", "fields": ["name", "address", "building", "smoking", "outdoor_seating", "brewery"], "moreFields": ["opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
-    "amenity/boat_rental": {"fields": ["name", "operator", "fee", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
-    "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["opening_hours"], "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"], "moreFields": ["diet_multi", "takeaway", "delivery", "capacity", "opening_hours", "smoking", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+    "amenity/biergarten": {"icon": "maki-beer", "fields": ["name", "address", "building", "smoking", "outdoor_seating", "brewery"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
+    "amenity/boat_rental": {"fields": ["name", "operator", "fee", "payment_multi"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
+    "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["opening_hours", "website", "phone", "email", "fax"], "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"], "moreFields": ["diet_multi", "takeaway", "delivery", "capacity", "opening_hours", "smoking", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
     "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "capacity"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
-    "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
+    "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "payment_multi"], "moreFields": ["brand", "address", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
     "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
-    "amenity/car_wash": {"icon": "maki-car", "fields": ["address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
-    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "smoking"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
+    "amenity/car_wash": {"icon": "maki-car", "fields": ["address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
+    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "smoking"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
     "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["operator", "capacity", "fee", "payment_multi"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
-    "amenity/childcare": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
-    "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "building_area", "opening_hours", "payment_multi"], "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", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "removeTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
+    "amenity/childcare": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
+    "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["website", "phone", "email", "fax"], "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", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "removeTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
     "amenity/clinic/abortion": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "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", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "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": ["lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "clock"}, "name": "Clock"},
-    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "address", "website", "internet_access"], "moreFields": ["internet_access/fee", "internet_access/ssid", "phone"], "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"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
+    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "address", "website", "internet_access"], "moreFields": ["religion", "denomination", "internet_access/fee", "internet_access/ssid", "phone", "email", "fax"], "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": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
     "amenity/compressed_air": {"icon": "maki-car", "fields": ["operator", "fee"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
-    "amenity/courthouse": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
-    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "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": ["payment_multi"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "removeTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
-    "amenity/dive_centre": {"icon": "maki-swimming", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["payment_multi"], "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": ["payment_multi"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "removeTags": {"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": ["payment_multi"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
+    "amenity/courthouse": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
+    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "website", "phone", "email", "fax"], "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": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "removeTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
+    "amenity/dive_centre": {"icon": "maki-swimming", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "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": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "removeTags": {"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": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
     "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "fee"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["fountain", "potable"], "name": "Drinking Water"},
-    "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
-    "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "name": "Embassy"},
-    "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["opening_hours", "diet_multi", "takeaway", "delivery", "smoking", "capacity", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
+    "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
+    "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "name": "Embassy"},
+    "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["opening_hours", "diet_multi", "takeaway", "delivery", "smoking", "capacity", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
     "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"},
     "amenity/fast_food/fish_and_chips": {"icon": "fas-fish", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "french fries"], "tags": {"amenity": "fast_food", "cuisine": "fish_and_chips"}, "reference": {"key": "cuisine", "value": "fish_and_chips"}, "name": "Fish & Chips Fast Food"},
     "amenity/fast_food/kebab": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "kebab"}, "reference": {"key": "cuisine", "value": "kebab"}, "name": "Kebab 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": "maki-restaurant", "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"], "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": ["smoking", "outdoor_seating", "capacity", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi"], "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": ["website", "phone", "email", "fax"], "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": ["smoking", "outdoor_seating", "capacity", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
     "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"},
-    "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi"], "moreFields": ["opening_hours", "payment_multi", "website", "phone"], "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", "denomination"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
+    "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "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": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
     "amenity/grit_bin": {"icon": "fas-box", "fields": ["access_simple"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
-    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "emergency"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "removeTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
+    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "emergency"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "removeTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
     "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
-    "amenity/ice_cream": {"icon": "maki-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "drive_through", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "payment_multi"], "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", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["opening_hours", "smoking", "outdoor_seating", "payment_multi"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
-    "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "moreFields": ["opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
-    "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["payment_multi", "website", "phone"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
-    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "ref/isil"], "moreFields": ["opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
-    "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
-    "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
-    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "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": "maki-bank", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["opening_hours"], "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/ice_cream": {"icon": "maki-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "drive_through", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "payment_multi", "website", "phone", "email", "fax"], "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", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["opening_hours", "smoking", "outdoor_seating", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
+    "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
+    "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
+    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "ref/isil"], "moreFields": ["opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "payment_multi"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
+    "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
+    "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
+    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "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": "maki-bank", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["opening_hours", "website", "phone", "email", "fax"], "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": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone"], "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", "smoking"], "moreFields": ["payment_multi", "website", "phone"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
+    "amenity/music_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "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", "smoking"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["access_simple", "ref"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
     "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
-    "amenity/parking": {"icon": "maki-car", "fields": ["operator", "parking", "capacity", "access_simple", "fee", "surface"], "moreFields": ["name", "supervised", "park_ride", "maxstay", "payment_multi", "address", "website"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
+    "amenity/parking": {"icon": "maki-car", "fields": ["operator", "parking", "capacity", "access_simple", "fee", "surface"], "moreFields": ["name", "supervised", "park_ride", "maxstay", "payment_multi", "address", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
     "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["{amenity/parking}", "building", "levels", "height"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "removeTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Parking Garage"},
-    "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
+    "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
     "amenity/payment_terminal": {"icon": "maki-bank", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["currency_multi"], "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": ["opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
-    "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["opening_hours", "internet_access", "internet_access/ssid", "website", "phone", "email"], "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/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
+    "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["opening_hours", "internet_access", "internet_access/ssid", "website", "phone", "email", "fax"], "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", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "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/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["kovil", "devasthana", "mandir", "kshetram", "alayam", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"},
@@ -128,18 +128,18 @@
     "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "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", "building_area", "address", "service_times"], "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-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi"], "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"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
+    "amenity/planetarium": {"icon": "maki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax"], "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": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
     "amenity/post_box": {"icon": "maki-post", "fields": ["operator", "collection_times", "drive_through", "ref"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"},
-    "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
-    "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["cell", "jail"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
-    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["outdoor_seating", "diet_multi", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
-    "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee"], "moreFields": ["opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
+    "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
+    "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["cell", "jail"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
+    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["outdoor_seating", "diet_multi", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
+    "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
     "amenity/public_bookcase": {"icon": "maki-library", "fields": ["name", "operator", "capacity", "website", "lit"], "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"], "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", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["fee", "payment_multi"], "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/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax"], "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", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax"], "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": ["recycling_accepts", "collection_times"], "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/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "capacity", "diet_multi", "smoking", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
+    "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "capacity", "diet_multi", "smoking", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "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"},
@@ -159,7 +159,7 @@
     "amenity/restaurant/turkish": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "turkish"}, "reference": {"key": "cuisine", "value": "turkish"}, "name": "Turkish Restaurant"},
     "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"},
     "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "water_point"], "moreFields": ["payment_multi"], "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": "maki-school", "fields": ["name", "operator", "address", "religion", "denomination", "website"], "moreFields": ["internet_access", "internet_access/ssid"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
+    "amenity/school": {"icon": "maki-school", "fields": ["name", "operator", "address", "religion", "denomination", "website"], "moreFields": ["internet_access", "internet_access/ssid", "phone", "email", "fax"], "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"], "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": "maki-shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"},
@@ -167,20 +167,20 @@
     "amenity/shelter/public_transport": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
     "amenity/shower": {"icon": "temaki-shower", "fields": ["operator", "opening_hours", "fee", "supervised", "building_area", "access_simple"], "moreFields": ["payment_multi"], "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"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
-    "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["opening_hours", "wheelchair", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
+    "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["opening_hours", "wheelchair", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
     "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": "maki-karaoke", "fields": ["name", "studio", "address", "building_area"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
+    "amenity/studio": {"icon": "maki-karaoke", "fields": ["name", "studio", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
     "amenity/taxi": {"icon": "fas-taxi", "fields": ["name", "operator", "capacity"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"},
     "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi", "booth"], "moreFields": ["covered", "indoor", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"},
-    "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
+    "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax"], "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", "operator", "building_area", "access_simple", "gender", "fee", "diaper"], "moreFields": ["payment_multi"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
-    "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
+    "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
     "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": ["payment_multi"], "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": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
     "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "name": "Vending Machine"},
     "amenity/vending_machine/news_papers": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "fee", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["newspaper"], "tags": {"amenity": "vending_machine", "vending": "news_papers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine", "searchable": false},
     "amenity/vending_machine/cigarettes": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["cigarette"], "tags": {"amenity": "vending_machine", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "name": "Cigarette Vending Machine"},
@@ -201,10 +201,10 @@
     "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_machine", "geometry": ["point"], "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_machine", "geometry": ["point"], "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"], "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": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
+    "amenity/veterinary": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
     "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"},
     "amenity/waste_disposal": {"icon": "maki-waste-basket", "fields": ["operator", "collection_times"], "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", "address", "opening_hours", "fee", "payment_multi"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
+    "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
     "amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash", "poo", "dog"], "name": "Dog Excrement Bin"},
     "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "water_point"}, "name": "RV Drinking Water"},
     "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
@@ -229,7 +229,7 @@
     "barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false},
     "barrier/block": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"},
     "barrier/bollard": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex", "line"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
-    "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
+    "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
     "barrier/cattle_grid": {"icon": "maki-barrier", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "name": "Cattle Grid"},
     "barrier/city_wall": {"icon": "maki-barrier", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "city_wall"}, "name": "City Wall"},
     "barrier/cycle_barrier": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "cycle_barrier"}, "name": "Cycle Barrier"},
@@ -246,7 +246,7 @@
     "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
     "barrier/retaining_wall": {"fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
     "barrier/stile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"},
-    "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"},
+    "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"},
     "barrier/wall": {"icon": "maki-barrier", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25},
     "boundary/administrative": {"name": "Administrative Boundary", "geometry": ["line"], "tags": {"boundary": "administrative"}, "fields": ["name", "admin_level"]},
     "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
@@ -302,9 +302,9 @@
     "building/university": {"icon": "maki-building", "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"},
     "camp_site/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"camp_site": "camp_pitch"}, "name": "Camp Pitch"},
-    "club": {"icon": "maki-heart", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
+    "club": {"icon": "maki-heart", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
     "club/sport": {"icon": "maki-heart", "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": ["product"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
+    "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["product", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
     "craft/jeweler": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "jeweler"}, "reference": {"key": "shop", "value": "jewelry"}, "name": "Jeweler", "searchable": false},
     "craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false},
     "craft/optician": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "optician"}, "reference": {"key": "shop", "value": "optician"}, "name": "Optician", "searchable": false},
@@ -359,7 +359,7 @@
     "emergency/official": {"fields": [], "geometry": ["line"], "tags": {"emergency": "official"}, "terms": [], "name": "Emergency Access Official", "searchable": false, "matchScore": 0.01},
     "emergency/private": {"fields": [], "geometry": ["line"], "tags": {"emergency": "private"}, "terms": [], "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01},
     "emergency/yes": {"fields": [], "geometry": ["line"], "tags": {"emergency": "yes"}, "terms": [], "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01},
-    "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "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": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
     "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
     "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"},
     "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
@@ -382,7 +382,7 @@
     "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "reference": {"key": "golf", "value": "tee"}, "name": "Tee Box"},
     "golf/water_hazard_area": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "water_hazard"}, "name": "Water Hazard"},
     "golf/water_hazard_line": {"icon": "maki-golf", "fields": ["name"], "geometry": ["line"], "tags": {"golf": "water_hazard"}, "name": "Water Hazard"},
-    "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "brand"], "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": ["opening_hours", "payment_multi", "brand", "website", "phone", "email", "fax"], "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"},
@@ -479,27 +479,27 @@
     "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false},
     "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false},
     "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false},
-    "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
-    "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"},
+    "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
+    "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"},
     "landuse/brownfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"},
-    "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"},
-    "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"},
-    "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"},
-    "landuse/construction": {"icon": "temaki-tools", "fields": ["name", "construction", "operator"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"},
-    "landuse/farmland": {"icon": "maki-farm", "fields": ["name", "operator", "crop", "produce"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
-    "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"},
-    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "lumber", "tree"], "name": "Managed Forest"},
-    "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"},
+    "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"},
+    "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"},
+    "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"},
+    "landuse/construction": {"icon": "temaki-tools", "fields": ["name", "construction", "operator"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"},
+    "landuse/farmland": {"icon": "maki-farm", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
+    "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"},
+    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "lumber", "tree"], "name": "Managed Forest"},
+    "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"},
     "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": [], "name": "Grass"},
     "landuse/greenfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "greenfield"}, "terms": [], "matchScore": 0.9, "name": "Greenfield"},
-    "landuse/greenhouse_horticulture": {"icon": "maki-garden", "fields": ["name", "operator"], "geometry": ["area"], "terms": ["flower", "greenhouse", "horticulture", "grow", "vivero"], "tags": {"landuse": "greenhouse_horticulture"}, "matchScore": 0.9, "name": "Greenhouse Horticulture"},
-    "landuse/harbour": {"icon": "maki-harbor", "fields": ["name", "operator"], "geometry": ["area"], "terms": ["boat"], "tags": {"landuse": "harbour"}, "name": "Harbor"},
-    "landuse/industrial": {"icon": "maki-industry", "fields": ["name", "industrial"], "geometry": ["area"], "tags": {"landuse": "industrial"}, "terms": [], "matchScore": 0.9, "name": "Industrial Area"},
+    "landuse/greenhouse_horticulture": {"icon": "maki-garden", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "terms": ["flower", "greenhouse", "horticulture", "grow", "vivero"], "tags": {"landuse": "greenhouse_horticulture"}, "matchScore": 0.9, "name": "Greenhouse Horticulture"},
+    "landuse/harbour": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "terms": ["boat"], "tags": {"landuse": "harbour"}, "name": "Harbor"},
+    "landuse/industrial": {"icon": "maki-industry", "fields": ["name", "industrial"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "industrial"}, "terms": [], "matchScore": 0.9, "name": "Industrial Area"},
     "landuse/industrial/scrap_yard": {"icon": "maki-car", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"industrial": "scrap_yard"}, "addTags": {"landuse": "industrial", "industrial": "scrap_yard"}, "removeTags": {"landuse": "industrial", "industrial": "scrap_yard"}, "reference": {"key": "industrial", "value": "scrap_yard"}, "terms": ["car", "junk", "metal", "salvage", "scrap", "u-pull-it", "vehicle", "wreck", "yard"], "name": "Scrap Yard"},
     "landuse/industrial/slaughterhouse": {"icon": "maki-slaughterhouse", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"industrial": "slaughterhouse"}, "addTags": {"landuse": "industrial", "industrial": "slaughterhouse"}, "removeTags": {"landuse": "industrial", "industrial": "slaughterhouse"}, "reference": {"key": "industrial", "value": "slaughterhouse"}, "terms": ["abattoir", "beef", "butchery", "calf", "chicken", "cow", "killing house", "meat", "pig", "pork", "poultry", "shambles", "stockyard"], "name": "Slaughterhouse"},
-    "landuse/landfill": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "landfill"}, "terms": ["dump"], "name": "Landfill"},
+    "landuse/landfill": {"geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "landfill"}, "terms": ["dump"], "name": "Landfill"},
     "landuse/meadow": {"icon": "maki-garden", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "meadow"}, "terms": [], "name": "Meadow"},
-    "landuse/military": {"icon": "temaki-military", "fields": ["name"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"},
+    "landuse/military": {"icon": "temaki-military", "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"},
     "landuse/military/airfield": {"icon": "maki-airfield", "fields": ["name", "iata", "icao"], "geometry": ["point", "area"], "tags": {"military": "airfield"}, "addTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "removeTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "reference": {"key": "military", "value": "airfield"}, "terms": ["aerodrome", "aeroway", "air force", "airplane", "airport", "army", "base", "bomb", "fight", "force", "guard", "heli*", "jet", "marine", "navy", "plane", "troop", "war"], "name": "Military Airfield"},
     "landuse/military/barracks": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "barracks"}, "addTags": {"landuse": "military", "military": "barracks"}, "removeTags": {"landuse": "military", "military": "barracks"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Barracks"},
     "landuse/military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "landuse": "military", "military": "bunker"}, "removeTags": {"building": "bunker", "landuse": "military", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"},
@@ -511,31 +511,31 @@
     "landuse/military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "office"}, "addTags": {"landuse": "military", "military": "office"}, "removeTags": {"landuse": "military", "military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"},
     "landuse/military/range": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "range"}, "addTags": {"landuse": "military", "military": "range"}, "removeTags": {"landuse": "military", "military": "range"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Military Range"},
     "landuse/military/training_area": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "training_area"}, "addTags": {"landuse": "military", "military": "training_area"}, "removeTags": {"landuse": "military", "military": "training_area"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Training Area"},
-    "landuse/orchard": {"icon": "maki-park-alt1", "fields": ["name", "operator", "trees"], "geometry": ["area"], "tags": {"landuse": "orchard"}, "terms": ["fruit"], "name": "Orchard"},
-    "landuse/plant_nursery": {"icon": "maki-garden", "fields": ["name", "operator", "plant"], "geometry": ["area"], "tags": {"landuse": "plant_nursery"}, "terms": ["flower", "garden", "grow", "vivero"], "name": "Plant Nursery"},
-    "landuse/quarry": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
+    "landuse/orchard": {"icon": "maki-park-alt1", "fields": ["name", "operator", "trees"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "orchard"}, "terms": ["fruit"], "name": "Orchard"},
+    "landuse/plant_nursery": {"icon": "maki-garden", "fields": ["name", "operator", "plant"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "plant_nursery"}, "terms": ["flower", "garden", "grow", "vivero"], "name": "Plant Nursery"},
+    "landuse/quarry": {"geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
     "landuse/railway": {"icon": "maki-rail", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"},
-    "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
-    "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"},
+    "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
+    "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"},
     "landuse/residential": {"icon": "maki-building", "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"},
     "landuse/residential/apartments": {"icon": "maki-building", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "removeTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"},
-    "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
-    "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
+    "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
+    "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
     "leisure": {"icon": "maki-pitch", "fields": ["name", "leisure"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "*"}, "name": "Leisure"},
-    "leisure/adult_gaming_centre": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "smoking"], "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": ["opening_hours", "payment_multi", "smoking"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
-    "leisure/bandstand": {"icon": "maki-music", "fields": ["name", "building_area", "operator"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"},
-    "leisure/beach_resort": {"icon": "maki-beach", "fields": ["name", "address", "fee"], "moreFields": ["opening_hours", "payment_multi", "smoking"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
-    "leisure/bird_hide": {"icon": "temaki-binoculars", "fields": ["name", "building_area", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "bird_hide"}, "terms": ["machan", "ornithology"], "name": "Bird Hide"},
+    "leisure/adult_gaming_centre": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "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": ["opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
+    "leisure/bandstand": {"icon": "maki-music", "fields": ["name", "building_area", "operator"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"},
+    "leisure/beach_resort": {"icon": "maki-beach", "fields": ["name", "address", "fee"], "moreFields": ["opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "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": {"geometry": ["point", "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": ["opening_hours", "payment_multi", "smoking"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
-    "leisure/common": {"icon": "temaki-pedestrian", "fields": ["name"], "geometry": ["point", "area"], "terms": ["open space"], "tags": {"leisure": "common"}, "name": "Common"},
-    "leisure/dance": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"},
-    "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["opening_hours", "payment_multi"], "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/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "geometry": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
+    "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "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": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"},
+    "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "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/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
     "leisure/firepit": {"icon": "maki-fire-station", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
     "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
-    "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi"], "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": ["opening_hours", "fee", "payment_multi", "website", "phone", "email", "fax"], "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"], "moreFields": ["opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "removeTags": {"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"}, "removeTags": {"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"},
@@ -549,16 +549,16 @@
     "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"}, "removeTags": {"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"}, "removeTags": {"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"}, "removeTags": {"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", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
-    "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi"], "geometry": ["point", "area"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"},
-    "leisure/hackerspace": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["payment_multi", "smoking"], "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": ["opening_hours", "payment_multi"], "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": ["opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
-    "leisure/marina": {"icon": "maki-harbor", "fields": ["name", "operator", "capacity", "fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"},
-    "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi"], "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"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
+    "leisure/garden": {"icon": "maki-garden", "fields": ["name", "operator", "access_simple"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
+    "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"},
+    "leisure/hackerspace": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "phone", "email", "fax"], "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": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "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": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
+    "leisure/marina": {"icon": "maki-harbor", "fields": ["name", "operator", "capacity", "fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "seamark/type", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"},
+    "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax"], "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": ["website", "phone", "email", "fax"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
     "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "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": ["smoking"], "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": ["smoking", "website", "phone", "email", "fax"], "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"], "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"},
     "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "surface", "lit"], "moreFields": ["access_simple", "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"},
@@ -581,17 +581,17 @@
     "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", "surface", "playground/max_age", "playground/min_age", "access_simple"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"},
-    "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "name": "Resort"},
-    "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee"], "moreFields": ["payment_multi"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
+    "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "name": "Resort"},
+    "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
     "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "access_simple", "fee"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex", "line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
-    "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee"], "moreFields": ["opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
+    "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
     "leisure/sports_centre/swimming": {"icon": "maki-swimming", "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"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
+    "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
     "leisure/swimming_pool": {"icon": "maki-swimming", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["operator", "address"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
     "leisure/track": {"icon": "iD-highway-road", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"},
     "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["race*", "horse", "track"], "name": "Racetrack (Horse Racing)"},
     "leisure/track/running": {"icon": "maki-pitch", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["race*", "running", "sprint", "track"], "name": "Racetrack (Running)"},
-    "leisure/water_park": {"icon": "maki-swimming", "fields": ["name", "operator", "address"], "moreFields": ["payment_multi", "brand"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
+    "leisure/water_park": {"icon": "maki-swimming", "fields": ["name", "operator", "address"], "moreFields": ["payment_multi", "brand", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
     "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "name": "Line", "matchScore": 0.1},
     "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "name": "Man Made"},
     "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["operator", "direction"], "terms": ["entrance", "underground", "mine", "cave"], "tags": {"man_made": "adit"}, "name": "Adit"},
@@ -607,14 +607,14 @@
     "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "moreFields": ["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"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
-    "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"},
+    "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["address", "website", "phone", "email", "fax", "seamark/type"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"},
     "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["material", "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"}, "name": "Mast"},
     "man_made/mast/communication": {"icon": "maki-communications-tower", "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": "maki-communications-tower", "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": "maki-communications-tower", "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": "maki-communications-tower", "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/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "area"], "fields": ["monitoring_multi", "operator"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
-    "man_made/observatory": {"geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
+    "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
     "man_made/petroleum_well": {"icon": "temaki-storage_tank", "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": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "access"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "name": "Pier"},
     "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
@@ -627,13 +627,13 @@
     "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"},
     "man_made/tower/communication": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "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/observation": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height"], "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/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
+    "man_made/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
     "man_made/water_tower": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
     "man_made/water_well": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "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"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
+    "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
     "manhole": {"icon": "maki-circle-stroked", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"},
     "manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"},
     "manhole/telecom": {"icon": "maki-circle-stroked", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "terms": ["cover", "phone", "hole", "telecom", "telephone", "bt"], "name": "Telecom Manhole"},
@@ -670,7 +670,7 @@
     "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "marsh", "reedbed", "swamp", "tidalflat"], "name": "Wetland"},
     "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"},
     "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": ["smoking", "operator"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
+    "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["smoking", "operator", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
     "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "terms": [], "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"}, "terms": [], "name": "Travel Agency", "searchable": false},
@@ -721,20 +721,20 @@
     "piste/sled": {"icon": "fas-snowflake", "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"], "geometry": ["point", "area"], "tags": {"place": "city_block"}, "name": "City Block"},
-    "place/city": {"icon": "maki-city", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"},
-    "place/hamlet": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "hamlet"}, "name": "Hamlet"},
+    "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"], "fields": ["name"], "tags": {"place": "locality"}, "name": "Locality"},
-    "place/neighbourhood": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "neighbourhood"}, "terms": ["neighbourhood"], "name": "Neighborhood"},
+    "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"], "geometry": ["point", "area"], "tags": {"place": "quarter"}, "terms": ["boro", "borough", "quarter"], "name": "Sub-Borough / Quarter"},
-    "place/square": {"geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "square"}, "name": "Square"},
-    "place/suburb": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "suburb"}, "terms": ["boro", "borough", "quarter"], "name": "Borough / Suburb"},
-    "place/town": {"icon": "maki-town", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "town"}, "name": "Town"},
-    "place/village": {"icon": "maki-village", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "village"}, "name": "Village"},
+    "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": {"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"},
     "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"},
@@ -794,7 +794,7 @@
     "public_transport/station_train": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "train": "yes"}, "addTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "removeTags": {"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": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "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": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "removeTags": {"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", "internet_access/fee", "internet_access/ssid"], "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": ["internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "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"}, "addTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "removeTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"},
     "public_transport/stop_position_aerialway": {"icon": "maki-aerialway", "fields": ["name", "ref_stop_position", "network", "operator"], "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": ["name", "ref_stop_position", "network", "operator"], "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"},
@@ -837,7 +837,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", "payment_multi"], "moreFields": ["opening_hours", "brand"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
+    "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "payment_multi"], "moreFields": ["opening_hours", "brand", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
     "shop/fishmonger": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false},
     "shop/furnace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["oven", "stove"], "tags": {"shop": "furnace"}, "name": "Furnace Store", "searchable": false},
     "shop/vacant": {"icon": "maki-shop", "fields": ["name", "address", "building_area"], "geometry": ["point", "area"], "tags": {"shop": "vacant"}, "name": "Vacant Shop", "searchable": false},
@@ -977,34 +977,34 @@
     "shop/window_blind": {"icon": "temaki-window", "geometry": ["point", "area"], "tags": {"shop": "window_blind"}, "name": "Window Blind Store"},
     "shop/wine": {"icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"},
     "tourism": {"icon": "maki-attraction", "fields": ["name", "tourism"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "*"}, "name": "Tourism"},
-    "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "fee"], "moreFields": ["payment_multi", "internet_access/fee", "internet_access/ssid"], "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"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"},
-    "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "smoking"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
-    "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"},
+    "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "fee"], "moreFields": ["payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "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"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"},
+    "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
+    "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["material", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"},
     "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": "maki-art-gallery", "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": "maki-art-gallery", "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", "area"], "tags": {"tourism": "attraction"}, "name": "Tourist Attraction"},
-    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "internet_access"], "moreFields": ["payment_multi", "internet_access/fee", "internet_access/ssid", "sanitary_dump_station", "power_supply"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
-    "tourism/caravan_site": {"icon": "maki-bus", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access"], "moreFields": ["operator", "fee", "payment_multi", "internet_access/fee", "internet_access/ssid", "smoking"], "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"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid"], "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"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
-    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
-    "tourism/hostel": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"},
-    "tourism/hotel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "stars"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
+    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "internet_access"], "moreFields": ["payment_multi", "internet_access/fee", "internet_access/ssid", "sanitary_dump_station", "power_supply", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
+    "tourism/caravan_site": {"icon": "maki-bus", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access"], "moreFields": ["operator", "fee", "payment_multi", "internet_access/fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax"], "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"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "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": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
+    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
+    "tourism/hostel": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"},
+    "tourism/hotel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "stars", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
     "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "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": "maki-information", "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": "maki-information", "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"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
-    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
-    "tourism/museum": {"icon": "maki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi"], "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": ["smoking", "fee", "payment_multi"], "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": ["payment_multi"], "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", "phone", "website", "opening_hours"], "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"], "moreFields": ["operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
+    "tourism/museum": {"icon": "maki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax"], "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": ["smoking", "fee", "payment_multi", "website"], "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": ["payment_multi", "website", "phone", "email", "fax"], "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", "opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
     "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
-    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "fireplace"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
-    "tourism/zoo": {"icon": "maki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee"], "moreFields": ["payment_multi"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
+    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "fireplace"], "moreFields": ["payment_multi"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
+    "tourism/zoo": {"icon": "maki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
     "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"},
     "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "speed", "slow"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"},
     "traffic_calming/chicane": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "area"], "terms": ["driveway link", "speed", "slow"], "tags": {"traffic_calming": "chicane"}, "name": "Traffic Chicane"},
@@ -1055,13 +1055,13 @@
     "type/waterway": {"icon": "iD-route-water", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "vertex": {"fields": ["name"], "geometry": ["vertex"], "tags": {}, "name": "Other", "matchScore": 0.1},
     "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
-    "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
+    "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
     "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
-    "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name"], "tags": {"waterway": "dam"}, "name": "Dam"},
+    "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "moreFields": ["website"], "fields": ["name"], "tags": {"waterway": "dam"}, "name": "Dam"},
     "waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "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"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"},
-    "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["payment_multi", "brand", "seamark/type"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
+    "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["payment_multi", "brand", "seamark/type", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
     "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"], "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", "water_point"], "moreFields": ["opening_hours", "payment_multi", "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"},

data/presets/presets/_attraction.json

@@ -7,10 +7,14 @@
         "opening_hours"
     ],
     "moreFields": [
-        "address",
         "opening_hours",
         "fee",
-        "payment_multi"
+        "payment_multi",
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/animal_boarding.json

@@ -9,7 +9,11 @@
         "animal_boarding"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/animal_breeding.json

@@ -8,6 +8,12 @@
         "opening_hours",
         "animal_breeding"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/animal_shelter.json

@@ -8,6 +8,12 @@
         "opening_hours",
         "animal_shelter"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/arts_centre.json

@@ -9,7 +9,11 @@
     ],
     "moreFields": [
         "fee",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/bank.json

@@ -10,7 +10,11 @@
     ],
     "moreFields": [
         "opening_hours",
-        "currency_multi"
+        "currency_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/bar.json

@@ -11,7 +11,11 @@
     "moreFields": [
         "smoking",
         "opening_hours",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/bicycle_rental.json

@@ -8,7 +8,12 @@
         "payment_multi"
     ],
     "moreFields": [
-        "opening_hours"
+        "opening_hours",
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/biergarten.json

@@ -10,7 +10,11 @@
     ],
     "moreFields": [
         "opening_hours",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/boat_rental.json

@@ -5,6 +5,13 @@
         "fee",
         "payment_multi"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/bureau_de_change.json

@@ -9,7 +9,11 @@
         "building_area"
     ],
     "moreFields": [
-        "opening_hours"
+        "opening_hours",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/cafe.json

@@ -17,7 +17,11 @@
         "payment_multi",
         "internet_access",
         "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/car_rental.json

@@ -5,6 +5,14 @@
         "operator",
         "payment_multi"
     ],
+    "moreFields": [
+        "brand",
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/car_wash.json

@@ -6,6 +6,12 @@
         "opening_hours",
         "payment_multi"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"    
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/casino.json

@@ -9,6 +9,12 @@
         "payment_multi",
         "smoking"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/childcare.json

@@ -8,7 +8,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/cinema.json

@@ -7,6 +7,12 @@
         "opening_hours",
         "payment_multi"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"    
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/clinic.json

@@ -9,7 +9,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/college.json

@@ -8,9 +8,13 @@
         "internet_access"
     ],
     "moreFields": [
+        "religion",
+        "denomination",
         "internet_access/fee",
         "internet_access/ssid",
-        "phone"
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/community_centre.json

@@ -6,6 +6,12 @@
         "address",
         "building_area"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/courthouse.json

@@ -6,6 +6,12 @@
         "address",
         "building_area"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/crematorium.json

@@ -7,6 +7,13 @@
         "opening_hours",
         "wheelchair"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area",
         "point"
@@ -14,6 +21,9 @@
     "tags": {
         "amenity": "crematorium"
     },
-    "terms": ["cemetery","funeral"],
+    "terms": [
+        "cemetery",
+        "funeral"
+    ],
     "name": "Crematorium"
 }

data/presets/presets/amenity/dentist.json

@@ -9,7 +9,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/dive_centre.json

@@ -9,7 +9,11 @@
         "scuba_diving"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/doctors.json

@@ -9,7 +9,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/dojo.json

@@ -8,7 +8,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry" : [
         "point",

data/presets/presets/amenity/driving_school.json

@@ -8,7 +8,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/embassy.json

@@ -6,6 +6,12 @@
         "address",
         "building_area"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/fast_food.json

@@ -19,7 +19,11 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/fire_station.json

@@ -6,6 +6,12 @@
         "address",
         "building_area"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/food_court.json

@@ -14,7 +14,11 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "diet_multi"
+        "diet_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/fuel.json

@@ -11,7 +11,9 @@
         "opening_hours",
         "payment_multi",
         "website",
-        "phone"
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/grave_yard.json

@@ -2,7 +2,13 @@
     "icon": "maki-cemetery",
     "fields": [
         "religion",
-        "denomination"
+        "address"
+    ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/hospital.json

@@ -12,7 +12,9 @@
         "internet_access/fee",
         "internet_access/ssid",
         "website",
-        "phone"
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/ice_cream.json

@@ -15,7 +15,11 @@
         "internet_access/fee",
         "internet_access/ssid",
         "diet_multi",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/internet_cafe.json

@@ -13,7 +13,11 @@
         "opening_hours",
         "smoking",
         "outdoor_seating",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/kindergarten.json

@@ -7,7 +7,11 @@
     ],
     "moreFields": [
         "opening_hours",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/language_school.json

@@ -11,7 +11,9 @@
     "moreFields": [
         "payment_multi",
         "website",
-        "phone"
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/library.json

@@ -12,6 +12,10 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "website",
+        "phone",
+        "email",
+        "fax",
         "payment_multi"
     ],
     "geometry": [

data/presets/presets/amenity/love_hotel.json

@@ -12,7 +12,11 @@
         "smoking",
         "payment_multi",
         "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/marketplace.json

@@ -7,6 +7,12 @@
         "building",
         "opening_hours"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/monastery.json

@@ -7,6 +7,12 @@
         "address",
         "building_area"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/money_transfer.json

@@ -9,7 +9,11 @@
         "currency_multi"
     ],
     "moreFields": [
-        "opening_hours"
+        "opening_hours",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/music_school.json

@@ -10,7 +10,9 @@
     "moreFields": [
         "payment_multi",
         "website",
-        "phone"
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/nightclub.json

@@ -11,7 +11,9 @@
     "moreFields": [
         "payment_multi",
         "website",
-        "phone"
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/parking.json

@@ -15,7 +15,10 @@
         "maxstay",
         "payment_multi",
         "address",
-        "website"
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/payment_centre.json

@@ -9,7 +9,11 @@
         "payment_multi"
     ],
     "moreFields": [
-        "currency_multi"
+        "currency_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/pharmacy.json

@@ -10,7 +10,11 @@
     ],
     "moreFields": [
         "opening_hours",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/place_of_worship.json

@@ -14,7 +14,8 @@
         "internet_access/ssid",
         "website",
         "phone",
-        "email"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/planetarium.json

@@ -9,7 +9,11 @@
     ],
     "moreFields": [
         "fee",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/police.json

@@ -7,6 +7,12 @@
         "building_area",
         "opening_hours"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/post_office.json

@@ -8,7 +8,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/prison.json

@@ -5,6 +5,12 @@
         "operator",
         "address"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/pub.json

@@ -16,7 +16,9 @@
         "internet_access/fee",
         "internet_access/ssid",
         "website",
-        "phone"
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/public_bath.json

@@ -11,7 +11,11 @@
     ],
     "moreFields": [
         "opening_hours",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/ranger_station.json

@@ -7,6 +7,12 @@
         "building_area",
         "opening_hours"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/recycling_centre.json

@@ -10,7 +10,11 @@
     ],
     "moreFields": [
         "fee",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/restaurant.json

@@ -16,7 +16,11 @@
         "smoking",
         "internet_access",
         "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/school.json

@@ -10,7 +10,10 @@
     ],
     "moreFields": [
         "internet_access",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/social_facility.json

@@ -13,7 +13,11 @@
         "wheelchair",
         "internet_access",
         "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/studio.json

@@ -6,6 +6,12 @@
         "address",
         "building_area"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/theatre.json

@@ -10,7 +10,11 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/townhall.json

@@ -6,6 +6,12 @@
         "address",
         "building_area"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/amenity/vehicle_inspection.json

@@ -8,7 +8,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/veterinary.json

@@ -9,7 +9,11 @@
     ],
     "moreFields": [
         "fee",
-        "payment_multi"
+        "payment_multi",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/waste_transfer_station.json

@@ -8,6 +8,12 @@
         "fee",
         "payment_multi"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/barrier/border_control.json

@@ -4,6 +4,13 @@
         "access",
         "building_area"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "vertex",
         "area"

data/presets/presets/barrier/toll_booth.json

@@ -6,6 +6,13 @@
         "payment_multi",
         "currency_multi"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "vertex",
         "area"

data/presets/presets/club.json

@@ -9,7 +9,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "access_simple"
+        "access_simple",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/craft.json

@@ -9,7 +9,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "product"    
+        "product",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/emergency/ambulance_station.json

@@ -6,6 +6,12 @@
         "building_area",
         "address"
     ],
+    "moreFields": [
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/healthcare.json

@@ -11,7 +11,11 @@
     "moreFields": [
         "opening_hours",
         "payment_multi",
-        "brand"
+        "brand",
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",

data/presets/presets/landuse/allotments.json

@@ -6,6 +6,13 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "tags": {
         "landuse": "allotments"
     },

data/presets/presets/landuse/aquaculture.json

@@ -5,6 +5,13 @@
         "operator",
         "produce"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/cemetery.json

@@ -5,6 +5,13 @@
         "religion",
         "denomination"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/churchyard.json

@@ -5,6 +5,13 @@
         "religion",
         "denomination"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/commercial.json

@@ -3,6 +3,13 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/construction.json

@@ -5,6 +5,13 @@
         "construction",
         "operator"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/farmland.json

@@ -6,6 +6,13 @@
         "crop",
         "produce"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/farmyard.json

@@ -5,6 +5,13 @@
         "operator",
         "crop"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/forest.json

@@ -6,6 +6,13 @@
         "leaf_cycle",
         "produce"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/garages.json

@@ -6,6 +6,13 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "tags": {
         "landuse": "garages"
     },

data/presets/presets/landuse/greenhouse_horticulture.json

@@ -4,6 +4,13 @@
         "name",
         "operator"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/harbour.json

@@ -4,6 +4,13 @@
         "name",
         "operator"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/industrial.json

@@ -4,6 +4,13 @@
         "name",
         "industrial"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/landfill.json

@@ -5,6 +5,13 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "tags": {
         "landuse": "landfill"
     },

data/presets/presets/landuse/military.json

@@ -3,6 +3,13 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/orchard.json

@@ -5,6 +5,13 @@
         "operator",
         "trees"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/plant_nursery.json

@@ -5,6 +5,13 @@
         "operator",
         "plant"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "geometry": [
         "area"
     ],

data/presets/presets/landuse/quarry.json

@@ -5,6 +5,13 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "tags": {
         "landuse": "quarry"
     },

data/presets/presets/landuse/recreation_ground.json

@@ -6,6 +6,13 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "tags": {
         "landuse": "recreation_ground"
     },

data/presets/presets/landuse/religious.json

@@ -8,6 +8,13 @@
         "religion",
         "denomination"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "tags": {
         "landuse": "religious"
     },

data/presets/presets/landuse/retail.json

@@ -6,6 +6,13 @@
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "address",
+        "website",
+        "phone",
+        "email",
+        "fax"
+    ],
     "tags": {
         "landuse": "retail"
     },