diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2b78c28d6..e0bf8c4a9 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -62,18 +62,18 @@
     "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"},
     "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca", "pound"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
     "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["email", "fax", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"},
-    "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "indoor", "lit", "name", "opening_hours", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
+    "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "height", "indoor", "lit", "manufacturer", "name", "opening_hours", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
     "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
     "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
     "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgbtq bar", "lgbt bar", "lgb bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"},
     "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "moreFields": ["lit"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
-    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "inscription", "lit"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"},
-    "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "covered", "access_simple", "fee", "payment_multi_fee"], "moreFields": ["lit"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
+    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"},
+    "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "covered", "access_simple", "fee", "payment_multi_fee"], "moreFields": ["colour", "indoor", "lit"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
     "amenity/bicycle_parking/building": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "opening_hours", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "building"}, "reference": {"key": "bicycle_parking"}, "terms": ["Multi-Storey Bicycle Park", "Multi-Storey Bike Park", "Bike Parking Station"], "name": "Bicycle Parking Garage"},
     "amenity/bicycle_parking/lockers": {"icon": "maki-bicycle", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "lockers"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Lockers"], "name": "Bicycle Lockers"},
     "amenity/bicycle_parking/shed": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "shed"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Shed"], "name": "Bicycle Shed"},
-    "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "fee", "payment_multi_fee"], "moreFields": ["opening_hours", "address", "website", "phone", "email", "fax", "wheelchair", "covered"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "hub", "dock"], "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_fee", "covered"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump", "tools", "stand", "multitool"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
+    "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "fee", "payment_multi_fee"], "moreFields": ["address", "email", "covered", "fax", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "hub", "dock"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
+    "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "payment_multi_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump", "tools", "stand", "multitool"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
     "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
     "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "fee", "payment_multi_fee"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "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", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
@@ -83,26 +83,26 @@
     "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["lit", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
     "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
     "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
-    "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
+    "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "access_simple", "fee", "payment_multi_fee"], "moreFields": ["brand", "covered", "manufacturer"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
     "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
     "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
     "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
     "amenity/clinic/abortion": {"icon": "maki-hospital", "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": ["indoor", "lit"], "geometry": ["point", "vertex"], "terms": ["time"], "tags": {"amenity": "clock"}, "name": "Clock"},
+    "amenity/clock": {"icon": "temaki-clock", "fields": ["name", "support", "display", "visibility", "date", "faces"], "moreFields": ["covered", "height", "indoor", "lit", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["time"], "tags": {"amenity": "clock"}, "name": "Clock"},
     "amenity/clock/sundial": {"icon": "temaki-clock", "fields": ["name", "support", "visibility", "inscription"], "moreFields": [], "geometry": ["point", "vertex"], "terms": ["gnomon", "shadow"], "tags": {"amenity": "clock", "display": "sundial"}, "reference": {"key": "display", "value": "sundial"}, "name": "Sundial"},
     "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["religion", "denomination", "internet_access/ssid", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
     "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
     "amenity/community_centre/lgbtq": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["lgbtq event", "lgbtq hall", "lgbt event", "lgbt hall", "lgb event", "lgb hall"], "tags": {"amenity": "community_centre", "lgbtq": "primary"}, "name": "LGBTQ+ Community Center"},
-    "amenity/compressed_air": {"icon": "maki-car", "fields": ["operator", "fee", "payment_multi_fee", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
+    "amenity/compressed_air": {"icon": "maki-car", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "covered", "lit"], "moreFields": ["brand", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
     "amenity/conference_centre": {"icon": "fas-user-tie", "fields": ["name", "operator", "building_area", "address", "website", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/fee", "internet_access/ssid", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "conference_centre"}, "terms": ["auditorium", "conference", "exhibition", "exposition", "lecture"], "name": "Convention Center"},
-    "amenity/courthouse": {"icon": "fas-gavel", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
+    "amenity/courthouse": {"icon": "fas-gavel", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
     "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "website", "phone", "email", "fax", "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", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
     "amenity/dive_centre": {"icon": "temaki-scuba_diving", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
     "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
     "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
-    "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "wheelchair"], "moreFields": ["lit", "covered"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
+    "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "wheelchair"], "moreFields": ["covered", "indoor", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
     "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
     "amenity/events_venue": {"icon": "fas-users", "fields": ["name", "operator", "building_area", "address", "website", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/fee", "internet_access/ssid", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "events_venue"}, "terms": ["banquet hall", "baptism", "Bar Mitzvah", "Bat Mitzvah", "birthdays", "celebrations", "conferences", "confirmation", "meetings", "parties", "party", "quinceañera", "reunions", "weddings"], "name": "Events Venue"},
     "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "opening_hours", "diet_multi", "takeaway", "delivery", "smoking", "capacity", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
@@ -115,16 +115,16 @@
     "amenity/fast_food/mexican": {"icon": "fas-pepper-hot", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "tacos", "burritos", "enchiladas", "fajitas", "nachos", "tortillas", "salsa", "tamales", "quesadillas"], "tags": {"amenity": "fast_food", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Fast Food"},
     "amenity/fast_food/pizza": {"icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "terms": ["dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "fast_food", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Fast Food"},
     "amenity/fast_food/sandwich": {"icon": "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"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
+    "amenity/fire_station": {"icon": "maki-fire-station", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
     "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["smoking", "outdoor_seating", "capacity", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "website", "phone", "email", "fax", "wheelchair"], "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/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "height", "lit"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"},
     "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["opening_hours", "payment_multi", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
     "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["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/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
     "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "emergency"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
     "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
     "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "drive_through", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
-    "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "opening_hours", "smoking", "outdoor_seating", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
+    "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "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": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "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", "internet_access", "internet_access/fee"], "moreFields": ["access_simple", "air_conditioning", "opening_hours", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "payment_multi"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
@@ -144,7 +144,7 @@
     "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
     "amenity/payment_terminal": {"icon": "far-credit-card", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "wheelchair"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"},
     "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
-    "amenity/photo_booth": {"icon": "fas-person-booth", "fields": ["name", "operator", "payment_multi", "wheelchair"], "geometry": ["point", "area"], "terms": ["photobooth", "photo", "booth", "kiosk", "camera"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"},
+    "amenity/photo_booth": {"icon": "fas-person-booth", "fields": ["name", "operator", "payment_multi", "wheelchair"], "moreFields": ["brand", "indoor"], "geometry": ["point", "area"], "terms": ["photobooth", "photo", "booth", "kiosk", "camera"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"},
     "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "opening_hours", "internet_access", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
     "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
     "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
@@ -159,7 +159,7 @@
     "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
     "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
     "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
-    "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"},
+    "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["access_simple", "brand", "covered", "height", "indoor", "manufacturer", "wheelchair"], "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": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
     "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["academic", "ACT", "SAT", "homework", "math", "reading", "test prep", "tutoring", "writing"], "tags": {"amenity": "prep_school"}, "name": "Test Prep / Tutoring School"},
     "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
@@ -190,7 +190,7 @@
     "amenity/restaurant/thai": {"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": "thai"}, "reference": {"key": "cuisine", "value": "thai"}, "name": "Thai Restaurant"},
     "amenity/restaurant/turkish": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "turkish"}, "reference": {"key": "cuisine", "value": "turkish"}, "name": "Turkish Restaurant"},
     "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"},
-    "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "water_point"], "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/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "water_point"], "moreFields": ["opening_hours"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
     "amenity/school": {"icon": "maki-school", "fields": ["name", "operator", "address", "religion", "denomination", "website"], "moreFields": ["internet_access", "internet_access/ssid", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
     "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
     "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"},
@@ -207,18 +207,18 @@
     "amenity/social_facility/homeless_shelter": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": ["houseless", "unhoused", "displaced"], "tags": {"amenity": "social_facility", "social_facility": "shelter", "social_facility:for": "homeless"}, "reference": {"key": "social_facility", "value": "shelter"}, "name": "Homeless Shelter"},
     "amenity/social_facility/nursing_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["elderly", "living", "nursing", "old", "senior", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "nursing_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home"},
     "amenity/studio": {"icon": "fas-microphone", "fields": ["name", "studio", "address", "building_area"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
-    "amenity/taxi": {"icon": "fas-taxi", "fields": ["name", "operator", "capacity"], "moreFields": ["address", "opening_hours", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"},
+    "amenity/taxi": {"icon": "fas-taxi", "fields": ["name", "operator", "capacity", "address"], "moreFields": ["access_simple", "brand", "opening_hours", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"},
     "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi_fee", "booth"], "moreFields": ["covered", "indoor", "lit", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"},
     "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
     "amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["open air", "outdoor", "greek", "ampi"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"},
     "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "diaper", "wheelchair", "building_area"], "moreFields": ["fee", "opening_hours", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
     "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"},
     "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"},
-    "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
+    "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
     "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
     "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
     "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
-    "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "moreFields": ["covered", "indoor"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
+    "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "moreFields": ["brand", "covered", "height", "indoor", "manufacturer"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
     "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"},
     "amenity/vending_machine/coffee": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["coffee"], "tags": {"amenity": "vending_machine", "vending": "coffee"}, "reference": {"key": "vending", "value": "coffee"}, "name": "Coffee Vending Machine"},
     "amenity/vending_machine/condoms": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["condom"], "tags": {"amenity": "vending_machine", "vending": "condoms"}, "reference": {"key": "vending", "value": "condoms"}, "name": "Condom Vending Machine"},
@@ -239,11 +239,11 @@
     "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": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
     "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"},
-    "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "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_fee"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
+    "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"},
+    "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
     "amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash", "poo", "dog"], "name": "Dog Excrement Bin"},
-    "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "water_point"}, "name": "RV Drinking Water"},
-    "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
+    "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "water_point"}, "name": "RV Drinking Water"},
+    "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
     "area": {"fields": ["name"], "geometry": ["area"], "tags": {"area": "yes"}, "terms": ["polygon"], "name": "Area", "matchScore": 0.1},
     "area/highway": {"fields": ["name", "area/highway", "surface"], "geometry": ["area"], "terms": ["area:highway", "edge of pavement", "highway area", "highway shape", "pavement", "road shape", "street area"], "tags": {"area:highway": "*"}, "name": "Road Surface"},
     "attraction/amusement_ride": {"icon": "maki-amusement-park", "geometry": ["point", "area"], "terms": ["theme park", "carnival ride"], "tags": {"attraction": "amusement_ride"}, "name": "Amusement Ride"},
@@ -294,7 +294,7 @@
     "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
     "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
     "building_part": {"icon": "maki-building", "fields": ["levels", "height", "building/material", "roof/colour"], "moreFields": ["layer"], "geometry": ["area"], "tags": {"building:part": "*"}, "matchScore": 0.5, "terms": ["roof", "simple 3D buildings"], "name": "Building Part"},
-    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/material", "layer", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
+    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/material", "layer", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
     "building/bunker": {"geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
     "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
     "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false},
@@ -637,7 +637,7 @@
     "leisure/park": {"icon": "maki-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "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/picnic_table/chess": {"icon": "fas-chess-pawn", "geometry": ["point"], "tags": {"leisure": "picnic_table", "sport": "chess"}, "reference": {"key": "sport", "value": "chess"}, "terms": ["bench", "chess board", "checkerboard", "checkers", "chequerboard", "game table"], "name": "Chess Table"},
-    "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "access_simple", "surface", "lit"], "moreFields": ["fee", "payment_multi_fee"], "geometry": ["point", "area"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
+    "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "access_simple", "surface", "lit"], "moreFields": ["covered", "fee", "indoor", "payment_multi_fee"], "geometry": ["point", "area"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
     "leisure/pitch/american_football": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "american_football"}, "reference": {"key": "sport", "value": "american_football"}, "terms": ["football", "gridiron"], "name": "American Football Field"},
     "leisure/pitch/australian_football": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "australian_football"}, "reference": {"key": "sport", "value": "australian_football"}, "terms": ["Aussie", "AFL", "football"], "name": "Australian Football Field"},
     "leisure/pitch/badminton": {"icon": "maki-tennis", "fields": ["{leisure/pitch}", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "badminton"}, "reference": {"key": "sport", "value": "badminton"}, "terms": [], "name": "Badminton Court"},
diff --git a/data/presets/presets/amenity/atm.json b/data/presets/presets/amenity/atm.json
index 655ad8ef8..f1c4cab84 100644
--- a/data/presets/presets/amenity/atm.json
+++ b/data/presets/presets/amenity/atm.json
@@ -10,8 +10,10 @@
     "moreFields": [
         "brand",
         "covered",
+        "height",
         "indoor",
         "lit",
+        "manufacturer",
         "name",
         "opening_hours",
         "wheelchair"
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index cd5b22f82..419a05a79 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -8,8 +8,11 @@
     ],
     "moreFields": [
         "access_simple",
+        "height",
         "inscription",
-        "lit"
+        "lit",
+        "manufacturer",
+        "operator"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/bicycle_parking.json b/data/presets/presets/amenity/bicycle_parking.json
index 9f18018f1..5f6d7ce59 100644
--- a/data/presets/presets/amenity/bicycle_parking.json
+++ b/data/presets/presets/amenity/bicycle_parking.json
@@ -10,6 +10,8 @@
         "payment_multi_fee"
     ],
     "moreFields": [
+        "colour",
+        "indoor",
         "lit"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json
index 22a293512..0af7d0ec4 100644
--- a/data/presets/presets/amenity/bicycle_rental.json
+++ b/data/presets/presets/amenity/bicycle_rental.json
@@ -8,14 +8,14 @@
         "payment_multi_fee"
     ],
     "moreFields": [
-        "opening_hours",
         "address",
-        "website",
-        "phone",
         "email",
+        "covered",
         "fax",
-        "wheelchair",
-        "covered"
+        "opening_hours",
+        "phone",
+        "website",
+        "wheelchair"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/bicycle_repair_station.json b/data/presets/presets/amenity/bicycle_repair_station.json
index 8789f55ab..d6f22aa18 100644
--- a/data/presets/presets/amenity/bicycle_repair_station.json
+++ b/data/presets/presets/amenity/bicycle_repair_station.json
@@ -5,11 +5,14 @@
         "brand",
         "opening_hours",
         "fee",
+        "payment_multi_fee",
         "service/bicycle"
     ],
     "moreFields": [
-        "payment_multi_fee",
-        "covered"
+        "colour",
+        "covered",
+        "indoor",
+        "manufacturer"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/charging_station.json b/data/presets/presets/amenity/charging_station.json
index de7bbaca9..aacdef52f 100644
--- a/data/presets/presets/amenity/charging_station.json
+++ b/data/presets/presets/amenity/charging_station.json
@@ -4,9 +4,15 @@
         "name",
         "operator",
         "capacity",
+        "access_simple",
         "fee",
         "payment_multi_fee"
     ],
+    "moreFields": [
+        "brand",
+        "covered",
+        "manufacturer"
+    ],
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/clock.json b/data/presets/presets/amenity/clock.json
index 310d5c079..6ab6dcc6e 100644
--- a/data/presets/presets/amenity/clock.json
+++ b/data/presets/presets/amenity/clock.json
@@ -9,8 +9,11 @@
         "faces"
     ],
     "moreFields": [
+        "covered",
+        "height",
         "indoor",
-        "lit"
+        "lit",
+        "manufacturer"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/compressed_air.json b/data/presets/presets/amenity/compressed_air.json
index 7d7e9863a..591db3565 100644
--- a/data/presets/presets/amenity/compressed_air.json
+++ b/data/presets/presets/amenity/compressed_air.json
@@ -2,10 +2,16 @@
     "icon": "maki-car",
     "fields": [
         "operator",
+        "access_simple",
         "fee",
         "payment_multi_fee",
+        "covered",
         "lit"
     ],
+    "moreFields": [
+        "brand",
+        "manufacturer"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/amenity/courthouse.json b/data/presets/presets/amenity/courthouse.json
index 1d6c6592f..582cacec4 100644
--- a/data/presets/presets/amenity/courthouse.json
+++ b/data/presets/presets/amenity/courthouse.json
@@ -7,10 +7,11 @@
         "building_area"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "smoking",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/drinking_water.json b/data/presets/presets/amenity/drinking_water.json
index 16906e538..ba3aed259 100644
--- a/data/presets/presets/amenity/drinking_water.json
+++ b/data/presets/presets/amenity/drinking_water.json
@@ -8,8 +8,9 @@
         "wheelchair"
     ],
     "moreFields": [
-        "lit",
-        "covered"
+        "covered",
+        "indoor",
+        "lit"
     ],
     "geometry": [
         "point"
diff --git a/data/presets/presets/amenity/fire_station.json b/data/presets/presets/amenity/fire_station.json
index d275a9e22..b879b47f6 100644
--- a/data/presets/presets/amenity/fire_station.json
+++ b/data/presets/presets/amenity/fire_station.json
@@ -7,10 +7,11 @@
         "building_area"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "smoking",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/fountain.json b/data/presets/presets/amenity/fountain.json
index 719b3b926..122f40675 100644
--- a/data/presets/presets/amenity/fountain.json
+++ b/data/presets/presets/amenity/fountain.json
@@ -3,8 +3,14 @@
     "fields": [
         "name",
         "operator",
+        "height",
         "lit"
     ],
+    "moreFields": [
+        "covered",
+        "indoor",
+        "manufacturer"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/amenity/grit_bin.json b/data/presets/presets/amenity/grit_bin.json
index 04bb1525c..f905f07f1 100644
--- a/data/presets/presets/amenity/grit_bin.json
+++ b/data/presets/presets/amenity/grit_bin.json
@@ -1,7 +1,15 @@
 {
     "icon": "fas-box",
-        "fields": [
-        "access_simple"
+    "fields": [
+        "operator",
+        "access_simple",
+        "material",
+        "collection_times"
+    ],
+    "moreFields": [
+        "colour",
+        "height",
+        "lit"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/internet_cafe.json b/data/presets/presets/amenity/internet_cafe.json
index 8343a2621..0bb4d6e04 100644
--- a/data/presets/presets/amenity/internet_cafe.json
+++ b/data/presets/presets/amenity/internet_cafe.json
@@ -11,14 +11,14 @@
     ],
     "moreFields": [
         "air_conditioning",
-        "opening_hours",
-        "smoking",
-        "outdoor_seating",
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "opening_hours",
+        "outdoor_seating",
+        "payment_multi",
+        "phone",
+        "smoking",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/photo_booth.json b/data/presets/presets/amenity/photo_booth.json
index 4acd75d07..72d9659ea 100644
--- a/data/presets/presets/amenity/photo_booth.json
+++ b/data/presets/presets/amenity/photo_booth.json
@@ -6,6 +6,10 @@
 		"payment_multi",
 		"wheelchair"
 	],
+	"moreFields": [
+		"brand",
+		"indoor"
+	],
 	"geometry": [
 		"point",
 		"area"
diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json
index 7bf46469c..486654f33 100644
--- a/data/presets/presets/amenity/post_box.json
+++ b/data/presets/presets/amenity/post_box.json
@@ -7,6 +7,12 @@
         "ref"
     ],
     "moreFields": [
+        "access_simple",
+        "brand",
+        "covered",
+        "height",
+        "indoor",
+        "manufacturer",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/sanitary_dump_station.json b/data/presets/presets/amenity/sanitary_dump_station.json
index 80c47198e..65618e0d1 100644
--- a/data/presets/presets/amenity/sanitary_dump_station.json
+++ b/data/presets/presets/amenity/sanitary_dump_station.json
@@ -7,6 +7,9 @@
         "payment_multi_fee",
         "water_point"
     ],
+    "moreFields": [
+        "opening_hours"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/amenity/taxi.json b/data/presets/presets/amenity/taxi.json
index a8bba54a1..dbb4f9c45 100644
--- a/data/presets/presets/amenity/taxi.json
+++ b/data/presets/presets/amenity/taxi.json
@@ -3,10 +3,12 @@
     "fields": [
         "name",
         "operator",
-        "capacity"
+        "capacity",
+        "address"
     ],
     "moreFields": [
-        "address",
+        "access_simple",
+        "brand",
         "opening_hours",
         "wheelchair"
     ],
diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json
index 048303d0f..39388e904 100644
--- a/data/presets/presets/amenity/townhall.json
+++ b/data/presets/presets/amenity/townhall.json
@@ -7,10 +7,11 @@
         "building_area"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "smoking",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/vending_machine.json b/data/presets/presets/amenity/vending_machine.json
index c954ec2cb..bc54d232d 100644
--- a/data/presets/presets/amenity/vending_machine.json
+++ b/data/presets/presets/amenity/vending_machine.json
@@ -7,8 +7,11 @@
         "currency_multi"
     ],
     "moreFields": [
+        "brand",
         "covered",
-        "indoor"
+        "height",
+        "indoor",
+        "manufacturer"
     ],
     "geometry": [
         "point"
diff --git a/data/presets/presets/amenity/waste_disposal.json b/data/presets/presets/amenity/waste_disposal.json
index ad49633e6..42908ce2c 100644
--- a/data/presets/presets/amenity/waste_disposal.json
+++ b/data/presets/presets/amenity/waste_disposal.json
@@ -2,7 +2,15 @@
     "icon": "fas-dumpster",
     "fields": [
         "operator",
-        "collection_times"
+        "collection_times",
+        "access_simple"
+    ],
+    "moreFields": [
+        "brand",
+        "colour",
+        "height",
+        "manufacturer",
+        "material"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/waste_transfer_station.json b/data/presets/presets/amenity/waste_transfer_station.json
index 5105177ac..e0a533486 100644
--- a/data/presets/presets/amenity/waste_transfer_station.json
+++ b/data/presets/presets/amenity/waste_transfer_station.json
@@ -9,10 +9,10 @@
         "payment_multi_fee"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/water_point.json b/data/presets/presets/amenity/water_point.json
index 66668ce27..2a52fbd39 100644
--- a/data/presets/presets/amenity/water_point.json
+++ b/data/presets/presets/amenity/water_point.json
@@ -3,7 +3,8 @@
     "fields": [
         "operator",
         "fee",
-        "payment_multi_fee"
+        "payment_multi_fee",
+        "opening_hours"
     ],
     "geometry": [
         "area",
diff --git a/data/presets/presets/amenity/watering_place.json b/data/presets/presets/amenity/watering_place.json
index 7748204d1..59fdda51b 100644
--- a/data/presets/presets/amenity/watering_place.json
+++ b/data/presets/presets/amenity/watering_place.json
@@ -3,7 +3,8 @@
     "fields": [
         "operator",
         "fee",
-        "payment_multi_fee"
+        "payment_multi_fee",
+        "opening_hours"
     ],
     "geometry": [
         "area",
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index 7484840cd..b70b73298 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -11,6 +11,7 @@
         "architect",
         "building/material",
         "layer",
+        "operator",
         "roof/colour",
         "smoking",
         "wheelchair"
diff --git a/data/presets/presets/leisure/pitch.json b/data/presets/presets/leisure/pitch.json
index 16b266a2c..ed94047cb 100644
--- a/data/presets/presets/leisure/pitch.json
+++ b/data/presets/presets/leisure/pitch.json
@@ -8,7 +8,9 @@
         "lit"
     ],
     "moreFields": [
+        "covered",
         "fee",
+        "indoor",
         "payment_multi_fee"
     ],
     "geometry": [