Move max_age, min_age, and baby fields out from under the playground directory (re: #6351)

Add Minimum Age and Maximum Age fields to more presets
Deprecate `minage` and `maxage`

data/deprecated.json

@@ -547,10 +547,18 @@
       "old": {"man_made": "winery"},
       "replace": {"craft": "winery"}
     },
+    {
+      "old": {"maxage": "*"},
+      "replace": {"max_age": "$1"}
+    },
     {
       "old": {"memorial": "plate"},
       "replace": {"memorial": "plaque"}
     },
+    {
+      "old": {"minage": "*"},
+      "replace": {"min_age": "$1"}
+    },
     {
       "old": {"mining_resource": "*"},
       "replace": {"resource": "$1"}

data/presets.yaml

@@ -229,6 +229,9 @@ en:
       attraction:
         # attraction=*
         label: Type
+      baby_seat:
+        # baby=*
+        label: Baby Seat
       backrest:
         # backrest=*
         label: Backrest
@@ -1195,6 +1198,11 @@ en:
         # material=*
         label: Material
         terms: '[translate with synonyms or related terms for ''Material'', separated by commas]'
+      max_age:
+        # max_age=*
+        label: Maximum Age
+        # 'terms: upper age limit'
+        terms: '[translate with synonyms or related terms for ''Maximum Age'', separated by commas]'
       maxheight:
         # maxheight=*
         label: Max Height
@@ -1233,6 +1241,11 @@ en:
         label: Microbrewery
         # 'terms: brewpub,craft beer'
         terms: '[translate with synonyms or related terms for ''Microbrewery'', separated by commas]'
+      min_age:
+        # min_age=*
+        label: Minimum Age
+        # 'terms: lower age limit'
+        terms: '[translate with synonyms or related terms for ''Minimum Age'', separated by commas]'
       minspeed:
         # minspeed=*
         label: Minimum Speed Limit
@@ -1632,15 +1645,6 @@ en:
       playground:
         # playground=*
         label: Type
-      playground/baby:
-        # baby=*
-        label: Baby Seat
-      playground/max_age:
-        # max_age=*
-        label: Maximum Age
-      playground/min_age:
-        # min_age=*
-        label: Minimum Age
       polling_station:
         # polling_station=*
         label: Polling Place

data/presets/fields.json

@@ -26,6 +26,7 @@
     "artwork_type": {"key": "artwork_type", "type": "combo", "label": "Type"},
     "atm": {"key": "atm", "type": "check", "label": "ATM"},
     "attraction": {"key": "attraction", "type": "typeCombo", "label": "Type"},
+    "baby_seat": {"key": "baby", "type": "check", "label": "Baby Seat"},
     "backrest": {"key": "backrest", "type": "check", "label": "Backrest"},
     "bar": {"key": "bar", "type": "check", "label": "Bar"},
     "barrier": {"key": "barrier", "type": "typeCombo", "label": "Type"},
@@ -219,6 +220,7 @@
     "map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"},
     "map_type": {"key": "map_type", "type": "typeCombo", "label": "Type"},
     "material": {"key": "material", "type": "combo", "label": "Material"},
+    "max_age": {"key": "max_age", "type": "number", "minValue": 0, "label": "Maximum Age", "terms": ["upper age limit"]},
     "maxheight": {"key": "maxheight", "type": "combo", "label": "Max Height", "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\"", "snake_case": false},
     "maxspeed": {"key": "maxspeed", "type": "maxspeed", "label": "Speed Limit", "placeholder": "40, 50, 60..."},
     "maxspeed/advisory": {"key": "maxspeed:advisory", "type": "maxspeed", "label": "Advisory Speed Limit", "placeholder": "40, 50, 60..."},
@@ -227,6 +229,7 @@
     "maxweight": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false},
     "memorial": {"key": "memorial", "type": "typeCombo", "label": "Type"},
     "microbrewery": {"key": "microbrewery", "type": "check", "label": "Microbrewery", "terms": ["brewpub", "craft beer"]},
+    "min_age": {"key": "min_age", "type": "number", "minValue": 0, "label": "Minimum Age", "terms": ["lower age limit"]},
     "minspeed": {"key": "minspeed", "type": "maxspeed", "label": "Minimum Speed Limit", "placeholder": "20, 30, 40..."},
     "monitoring_multi": {"key": "monitoring:", "type": "multiCombo", "label": "Monitoring"},
     "mtb/scale": {"key": "mtb:scale", "type": "combo", "label": "Mountain Biking Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Solid gravel/packed earth, no obstacles, wide curves", "1": "1: Some loose surface, small obstacles, wide curves", "2": "2: Much loose surface, large obstacles, easy hairpins", "3": "3: Slippery surface, large obstacles, tight hairpins", "4": "4: Loose surface or boulders, dangerous hairpins", "5": "5: Maximum difficulty, boulder fields, landslides", "6": "6: Not rideable except by the very best mountain bikers"}}},
@@ -270,9 +273,6 @@
     "plant": {"key": "plant", "type": "combo", "label": "Plant"},
     "plant/output/electricity": {"key": "plant:output:electricity", "type": "text", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW..."},
     "playground": {"key": "playground", "type": "combo", "label": "Type"},
-    "playground/baby": {"key": "baby", "type": "check", "label": "Baby Seat"},
-    "playground/max_age": {"key": "max_age", "type": "number", "minValue": 0, "label": "Maximum Age"},
-    "playground/min_age": {"key": "min_age", "type": "number", "minValue": 0, "label": "Minimum Age"},
     "polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]},
     "population": {"key": "population", "type": "text", "label": "Population"},
     "post": {"type": "address", "key": "post", "keys": ["post:block_number", "post:city", "post:block_number", "post:conscriptionnumber", "post:county", "post:country", "post:county", "post:district", "post:floor", "post:hamlet", "post:housename", "post:housenumber", "post:neighbourhood", "post:place", "post:postcode", "post:province", "post:quarter", "post:state", "post:street", "post:subdistrict", "post:suburb", "post:unit"], "label": "Delivery Address"},

data/presets/fields/max_age.json

@@ -0,0 +1,9 @@
+{
+    "key": "max_age",
+    "type": "number",
+    "minValue": 0,
+    "label": "Maximum Age",
+    "terms": [
+        "upper age limit"
+    ]
+}

data/presets/fields/min_age.json

@@ -0,0 +1,9 @@
+{
+    "key": "min_age",
+    "type": "number",
+    "minValue": 0,
+    "label": "Minimum Age",
+    "terms": [
+        "lower age limit"
+    ]
+}

data/presets/fields/playground/max_age.json

@@ -1,6 +0,0 @@
-{
-    "key": "max_age",
-    "type": "number",
-    "minValue": 0,
-    "label": "Maximum Age"
-}

data/presets/fields/playground/min_age.json

@@ -1,6 +0,0 @@
-{
-    "key": "min_age",
-    "type": "number",
-    "minValue": 0,
-    "label": "Minimum Age"
-}

data/presets/presets.json

@@ -3,7 +3,7 @@
     "aerialway": {"fields": ["name", "aerialway"], "moreFields": ["layer"], "geometry": ["point", "vertex", "line"], "tags": {"aerialway": "*"}, "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", "line", "area"], "tags": {"amenity": "*"}, "searchable": false, "name": "Amenity"},
-    "attraction": {"icon": "maki-star", "fields": ["name", "attraction", "operator", "opening_hours"], "moreFields": ["charge_fee", "opening_hours", "fee", "payment_multi", "address", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "line", "area"], "tags": {"attraction": "*"}, "searchable": false, "name": "Attraction"},
+    "attraction": {"icon": "maki-star", "fields": ["name", "attraction", "operator", "opening_hours", "fee", "charge_fee"], "moreFields": ["address", "email", "fax", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"attraction": "*"}, "searchable": false, "name": "Attraction"},
     "boundary": {"fields": ["boundary"], "geometry": ["line"], "tags": {"boundary": "*"}, "searchable": false, "name": "Boundary"},
     "building_point": {"icon": "maki-home", "fields": ["{building}"], "moreFields": ["{building}"], "geometry": ["point"], "tags": {"building": "*"}, "matchScore": 0.6, "searchable": false, "terms": [], "name": "Building"},
     "embankment": {"geometry": ["line"], "tags": {"embankment": "yes"}, "name": "Embankment", "matchScore": 0.2, "searchable": false},
@@ -16,7 +16,7 @@
     "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "matchScore": 0.95, "searchable": false, "name": "Man Made"},
     "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural"},
     "place": {"fields": ["name", "place"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"},
-    "playground": {"icon": "maki-playground", "fields": ["playground"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"},
+    "playground": {"icon": "maki-playground", "fields": ["playground", "min_age", "max_age", "wheelchair", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"},
     "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power"},
     "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway"},
     "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"},
@@ -68,7 +68,7 @@
     "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"},
     "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "height", "indoor", "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": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "min_age", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
     "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgbtq bar", "lgbt bar", "lgb bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"},
     "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "moreFields": ["lit"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
     "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"},
@@ -81,15 +81,15 @@
     "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", "operator/type", "fee", "payment_multi_fee", "charge_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"},
-    "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "bar", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access/ssid", "not/name", "opening_hours", "payment_multi", "phone", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+    "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "bar", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access/ssid", "min_age", "not/name", "opening_hours", "payment_multi", "phone", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
     "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "lit"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
     "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
     "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "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/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", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
     "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["brand", "covered", "manufacturer"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
-    "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["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/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "min_age", "max_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
+    "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "email", "fax", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
     "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "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", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "abortion"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Abortion Clinic"},
     "amenity/clinic/fertility": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["egg", "fertility", "reproductive", "sperm", "ovulation"], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "fertility"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Fertility Clinic"},
@@ -109,7 +109,7 @@
     "amenity/dressing_room": {"icon": "maki-clothing-store", "fields": ["operator", "access_simple", "gender", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "opening_hours", "payment_multi_fee", "ref"], "geometry": ["point", "area"], "terms": ["changeroom", "dressing room", "fitting room", "locker room"], "tags": {"amenity": "dressing_room"}, "name": "Changing Room"},
     "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "wheelchair"], "moreFields": ["covered", "indoor", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
     "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["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/events_venue": {"icon": "fas-users", "fields": ["name", "operator", "building_area", "address", "website", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "min_age", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "events_venue"}, "terms": ["banquet hall", "baptism", "Bar Mitzvah", "Bat Mitzvah", "birthdays", "celebrations", "conferences", "confirmation", "meetings", "parties", "party", "quinceañera", "reunions", "weddings"], "name": "Events Venue"},
     "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "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"},
     "amenity/fast_food/ice_cream": {"icon": "fas-ice-cream", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "ice_cream"}, "reference": {"key": "cuisine", "value": "ice_cream"}, "name": "Ice Cream Fast Food", "searchable": false},
     "amenity/fast_food/burger": {"icon": "maki-fast-food", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Fast Food"},
@@ -130,18 +130,18 @@
     "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", "operator/type", "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/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "payment_multi", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
-    "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
+    "amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "min_age", "payment_multi", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
+    "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "min_age", "max_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
     "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "operator/type", "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/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "lit", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
     "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "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", "internet_access/fee"], "moreFields": ["smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
+    "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "min_age", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
     "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "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", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
     "amenity/money_transfer": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["money order", "check", "bill", "currency", "finance", "wire transfer", "cable", "person to person", "cash to cash", "exchange"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"},
     "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"},
     "amenity/music_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
-    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
+    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
     "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["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"},
@@ -173,7 +173,7 @@
     "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", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
     "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["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", "operator/type", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
-    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
+    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
     "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgbtq pub", "lgbt pub", "lgb pub"], "name": "LGBTQ+ Pub"},
     "amenity/pub/microbrewery": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "microbrewery": "yes"}, "reference": {"key": "microbrewery"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze", "craft brewery", "microbrewery", "small batch brewery"], "name": "Brewpub"},
     "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
@@ -183,7 +183,7 @@
     "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["operator", "recycling_accepts", "collection_times"], "moreFields": ["colour", "covered", "indoor", "manufacturer", "material"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
     "amenity/recycling/container/electrical_items": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["computers", "electronic waste", "electronics recycling", "ewaste bin", "phones", "tablets"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:electrical_items": "yes"}, "reference": {"key": "recycling:electrical_items", "value": "yes"}, "name": "E-Waste Container"},
     "amenity/recycling/container/green_waste": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["biodegradable", "biological", "compost", "decomposable", "garbage bin", "garden waste", "organic", "rubbish", "food scrap"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:green_waste": "yes"}, "reference": {"key": "recycling:green_waste", "value": "yes"}, "name": "Green Waste Container"},
-    "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "not/name", "outdoor_seating", "reservation", "smoking", "stars", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
+    "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "min_age", "not/name", "outdoor_seating", "reservation", "smoking", "stars", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
     "amenity/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"},
     "amenity/restaurant/asian": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "asian"}, "reference": {"key": "cuisine", "value": "asian"}, "name": "Asian Restaurant"},
     "amenity/restaurant/chinese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "chinese"}, "reference": {"key": "cuisine", "value": "chinese"}, "name": "Chinese Restaurant"},
@@ -221,7 +221,7 @@
     "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", "address"], "moreFields": ["access_simple", "brand", "opening_hours", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"},
     "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi_fee", "charge_fee", "booth"], "moreFields": ["covered", "indoor", "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": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area", "website"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "min_age", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
     "amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["open air", "outdoor", "greek", "ampi"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"},
     "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "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"},
@@ -232,7 +232,7 @@
     "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": ["brand", "covered", "height", "indoor", "manufacturer"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
     "amenity/vending_machine/bottle_return": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["bottle return"], "tags": {"amenity": "vending_machine", "vending": "bottle_return"}, "reference": {"key": "vending", "value": "bottle_return"}, "name": "Bottle Return 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/cigarettes": {"icon": "temaki-vending_machine", "moreFields": ["{amenity/vending_machine}", "min_age"], "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"},
     "amenity/vending_machine/drinks": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["drink", "soda", "beverage", "juice", "pop"], "tags": {"amenity": "vending_machine", "vending": "drinks"}, "reference": {"key": "vending", "value": "drinks"}, "name": "Drink Vending Machine"},
@@ -259,21 +259,21 @@
     "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
     "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"},
+    "attraction/amusement_ride": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "carnival ride"], "tags": {"attraction": "amusement_ride"}, "name": "Amusement Ride"},
     "attraction/animal": {"icon": "maki-zoo", "fields": ["name", "operator", "species/wikidata"], "geometry": ["point", "area"], "terms": ["amphibian", "animal park", "aquarium", "bear", "bird", "fish", "insect", "lion", "mammal", "monkey", "penguin", "reptile", "safari", "theme park", "tiger", "zoo"], "tags": {"attraction": "animal"}, "name": "Animal Enclosure"},
-    "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["{attraction}", "height"], "geometry": ["point"], "terms": ["ferris wheel", "theme park", "amusement ride"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"},
-    "attraction/bumper_car": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["theme park", "dodgem cars", "autoscooter"], "tags": {"attraction": "bumper_car"}, "name": "Bumper Car"},
-    "attraction/bungee_jumping": {"icon": "maki-pitch", "fields": ["{attraction}", "height"], "geometry": ["point", "area"], "terms": ["theme park", "bungy jumping", "jumping platform"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"},
-    "attraction/carousel": {"icon": "temaki-amusement_park", "fields": ["{attraction}", "building_area"], "geometry": ["point", "area"], "terms": ["theme park", "roundabout", "merry-go-round", "galloper", "jumper", "horseabout", "flying horses"], "tags": {"attraction": "carousel"}, "name": "Carousel"},
-    "attraction/dark_ride": {"icon": "maki-rail-metro", "fields": ["{attraction}", "building_area"], "geometry": ["point", "line", "area"], "terms": ["theme park", "ghost train"], "tags": {"attraction": "dark_ride"}, "name": "Dark Ride"},
-    "attraction/drop_tower": {"icon": "temaki-tower", "fields": ["{attraction}", "height"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "gondola", "tower", "big drop"], "tags": {"attraction": "drop_tower"}, "name": "Drop Tower"},
-    "attraction/maze": {"icon": "maki-amusement-park", "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "labyrinth"], "tags": {"attraction": "maze"}, "name": "Maze"},
-    "attraction/pirate_ship": {"icon": "maki-danger", "geometry": ["point"], "terms": ["theme park", "carnival ride", "amusement ride"], "tags": {"attraction": "pirate_ship"}, "name": "Pirate Ship"},
-    "attraction/river_rafting": {"icon": "maki-ferry", "geometry": ["point", "line"], "terms": ["theme park", "aquatic park", "water park", "rafting simulator", "river rafting ride", "river rapids ride"], "tags": {"attraction": "river_rafting"}, "name": "River Rafting"},
-    "attraction/roller_coaster": {"icon": "maki-amusement-park", "geometry": ["point", "area"], "terms": ["theme park", "amusement ride"], "tags": {"attraction": "roller_coaster"}, "name": "Roller Coaster"},
-    "attraction/summer_toboggan": {"icon": "temaki-sledding", "geometry": ["line"], "terms": ["alpine slide", "mountain coaster"], "tags": {"attraction": "summer_toboggan"}, "name": "Summer Toboggan"},
+    "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "terms": ["ferris wheel", "theme park", "amusement ride"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"},
+    "attraction/bumper_car": {"icon": "maki-car", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "dodgem cars", "autoscooter"], "tags": {"attraction": "bumper_car"}, "name": "Bumper Car"},
+    "attraction/bungee_jumping": {"icon": "maki-pitch", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "bungy jumping", "jumping platform"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"},
+    "attraction/carousel": {"icon": "temaki-amusement_park", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "roundabout", "merry-go-round", "galloper", "jumper", "horseabout", "flying horses"], "tags": {"attraction": "carousel"}, "name": "Carousel"},
+    "attraction/dark_ride": {"icon": "maki-rail-metro", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "line", "area"], "terms": ["theme park", "ghost train"], "tags": {"attraction": "dark_ride"}, "name": "Dark Ride"},
+    "attraction/drop_tower": {"icon": "temaki-tower", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "gondola", "tower", "big drop"], "tags": {"attraction": "drop_tower"}, "name": "Drop Tower"},
+    "attraction/maze": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "labyrinth"], "tags": {"attraction": "maze"}, "name": "Maze"},
+    "attraction/pirate_ship": {"icon": "maki-danger", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "terms": ["theme park", "carnival ride", "amusement ride"], "tags": {"attraction": "pirate_ship"}, "name": "Pirate Ship"},
+    "attraction/river_rafting": {"icon": "maki-ferry", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "line"], "terms": ["theme park", "aquatic park", "water park", "rafting simulator", "river rafting ride", "river rapids ride"], "tags": {"attraction": "river_rafting"}, "name": "River Rafting"},
+    "attraction/roller_coaster": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride"], "tags": {"attraction": "roller_coaster"}, "name": "Roller Coaster"},
+    "attraction/summer_toboggan": {"icon": "temaki-sledding", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["line"], "terms": ["alpine slide", "mountain coaster"], "tags": {"attraction": "summer_toboggan"}, "name": "Summer Toboggan"},
     "attraction/train": {"icon": "maki-rail", "fields": ["{attraction}", "fee", "charge_fee"], "geometry": ["point", "line"], "terms": ["theme park", "rackless train", "road train", "Tschu-Tschu train", "dotto train", "park train"], "tags": {"attraction": "train"}, "name": "Tourist Train"},
-    "attraction/water_slide": {"icon": "fas-swimmer", "fields": ["{attraction}", "height"], "geometry": ["line", "area"], "terms": ["theme park", "aquatic park", "water park", "flumes", "water chutes", "hydroslides"], "tags": {"attraction": "water_slide"}, "name": "Water Slide"},
+    "attraction/water_slide": {"icon": "fas-swimmer", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["line", "area"], "terms": ["theme park", "aquatic park", "water park", "flumes", "water chutes", "hydroslides"], "tags": {"attraction": "water_slide"}, "name": "Water Slide"},
     "barrier": {"icon": "maki-roadblock", "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "name": "Barrier", "matchScore": 0.4},
     "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"},
@@ -359,7 +359,7 @@
     "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"},
     "building/university": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"},
     "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"},
-    "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
+    "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
     "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
     "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "product", "website", "wheelchair"], "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, "replacement": "shop/jewelry"},
@@ -372,14 +372,14 @@
     "craft/blacksmith": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "blacksmith"}, "name": "Blacksmith"},
     "craft/boatbuilder": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "boatbuilder"}, "matchScore": 0.4, "name": "Boat Builder"},
     "craft/bookbinder": {"icon": "maki-library", "geometry": ["point", "area"], "terms": ["book repair"], "tags": {"craft": "bookbinder"}, "name": "Bookbinder"},
-    "craft/brewery": {"icon": "temaki-storage_tank", "fields": ["{craft}", "product"], "geometry": ["point", "area"], "terms": ["alcohol", "beer", "beverage", "bier", "booze", "cider"], "tags": {"craft": "brewery"}, "name": "Brewery"},
+    "craft/brewery": {"icon": "temaki-storage_tank", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beer", "beverage", "bier", "booze", "cider"], "tags": {"craft": "brewery"}, "name": "Brewery"},
     "craft/carpenter": {"icon": "temaki-tools", "geometry": ["point", "area"], "terms": ["woodworker"], "tags": {"craft": "carpenter"}, "name": "Carpenter"},
     "craft/carpet_layer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "carpet_layer"}, "name": "Carpet Layer"},
     "craft/caterer": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "{craft}"], "geometry": ["point", "area"], "tags": {"craft": "caterer"}, "name": "Caterer"},
     "craft/chimney_sweeper": {"icon": "temaki-chimney", "geometry": ["point", "area"], "tags": {"craft": "chimney_sweeper"}, "name": "Chimney Sweeper"},
     "craft/clockmaker": {"icon": "temaki-clock", "geometry": ["point", "area"], "tags": {"craft": "clockmaker"}, "name": "Clockmaker"},
     "craft/confectionery": {"icon": "maki-confectionery", "geometry": ["point", "area"], "terms": ["sweet", "candy"], "tags": {"craft": "confectionery"}, "name": "Candy Maker"},
-    "craft/distillery": {"icon": "temaki-storage_tank", "fields": ["{craft}", "product"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "bourbon", "booze", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"},
+    "craft/distillery": {"icon": "temaki-storage_tank", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "bourbon", "booze", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"},
     "craft/dressmaker": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "terms": ["seamstress"], "tags": {"craft": "dressmaker"}, "name": "Dressmaker"},
     "craft/electrician": {"icon": "temaki-power", "geometry": ["point", "area"], "terms": ["power", "wire"], "tags": {"craft": "electrician"}, "name": "Electrician"},
     "craft/electronics_repair": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "electronics_repair"}, "name": "Electronics Repair Shop"},
@@ -414,7 +414,7 @@
     "craft/upholsterer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "upholsterer"}, "name": "Upholsterer"},
     "craft/watchmaker": {"icon": "maki-watch", "geometry": ["point", "area"], "tags": {"craft": "watchmaker"}, "name": "Watchmaker"},
     "craft/window_construction": {"icon": "temaki-window", "geometry": ["point", "area"], "terms": ["glass"], "tags": {"craft": "window_construction"}, "name": "Window Construction"},
-    "craft/winery": {"icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"},
+    "craft/winery": {"icon": "maki-alcohol-shop", "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"},
     "emergency/designated": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "designated"}, "terms": [], "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01},
     "emergency/destination": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "destination"}, "terms": [], "name": "Emergency Access Destination", "searchable": false, "matchScore": 0.01},
     "emergency/no": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "no"}, "terms": [], "name": "Emergency Access No", "searchable": false, "matchScore": 0.01},
@@ -608,12 +608,12 @@
     "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"},
     "landuse/winter_sports": {"icon": "fas-skiing", "geometry": ["area"], "fields": ["name", "operator"], "moreFields": ["address", "access_simple", "opening_hours"], "tags": {"landuse": "winter_sports"}, "terms": ["piste area", "ski area", "ski hill", "ski mountain", "ski resort", "snow board area", "snowboard area"], "name": "Winter Sports Area"},
     "leisure/adult_gaming_centre": {"icon": "temaki-casino", "fields": ["{amenity/casino}"], "moreFields": ["{amenity/casino}"], "geometry": ["point", "area"], "terms": ["gambling", "slot machine"], "tags": {"leisure": "adult_gaming_centre"}, "name": "Adult Gaming Center"},
-    "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "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/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "max_age", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
     "leisure/bandstand": {"icon": "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", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["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": ["air_conditioning", "opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
+    "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
     "leisure/common": {"icon": "temaki-pedestrian", "fields": ["name"], "moreFields": ["website"], "geometry": ["point", "area"], "terms": ["open space"], "tags": {"leisure": "common"}, "name": "Common"},
     "leisure/dance": {"icon": "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"},
@@ -671,7 +671,7 @@
     "leisure/pitch/table_tennis": {"icon": "maki-tennis", "fields": ["name", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "table_tennis"}, "reference": {"key": "sport", "value": "table_tennis"}, "terms": ["table tennis", "ping pong"], "name": "Ping Pong Table"},
     "leisure/pitch/tennis": {"icon": "maki-tennis", "fields": ["{leisure/pitch}", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "tennis"}, "reference": {"key": "sport", "value": "tennis"}, "terms": [], "name": "Tennis Court"},
     "leisure/pitch/volleyball": {"icon": "maki-volleyball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "volleyball"}, "reference": {"key": "sport", "value": "volleyball"}, "terms": [], "name": "Volleyball Court"},
-    "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "surface", "playground/max_age", "playground/min_age", "access_simple"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"},
+    "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "surface", "min_age", "max_age", "access_simple"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"},
     "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "resort", "address", "opening_hours"], "moreFields": ["access_simple", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "terms": ["recreation center", "sanatorium", "ski and snowboard resort", "vacation resort", "winter sports resort"], "name": "Resort"},
     "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
     "leisure/slipway_point": {"icon": "maki-slipway", "fields": ["{leisure/slipway}"], "moreFields": ["{leisure/slipway}"], "geometry": ["point", "vertex"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
@@ -872,14 +872,14 @@
     "playground/basket_swing": {"icon": "maki-playground", "geometry": ["point"], "tags": {"playground": "basketswing"}, "name": "Basket Swing"},
     "playground/climbing_frame": {"icon": "maki-playground", "geometry": ["point", "area"], "tags": {"playground": "climbingframe"}, "name": "Climbing Frame"},
     "playground/cushion": {"icon": "maki-playground", "geometry": ["point", "area"], "tags": {"playground": "cushion"}, "name": "Bouncy Cushion"},
-    "playground/horizontal_bar": {"icon": "maki-pitch", "fields": ["height"], "geometry": ["point"], "terms": ["high bar"], "tags": {"playground": "horizontal_bar"}, "name": "Play Horizontal Bar"},
+    "playground/horizontal_bar": {"icon": "maki-pitch", "geometry": ["point"], "terms": ["high bar"], "tags": {"playground": "horizontal_bar"}, "name": "Play Horizontal Bar"},
     "playground/rocker": {"icon": "maki-playground", "geometry": ["point"], "tags": {"playground": "springy"}, "name": "Spring Rider", "terms": ["spring rocker", "springy rocker"]},
-    "playground/roundabout": {"icon": "maki-stadium", "fields": ["bench"], "geometry": ["point", "area"], "tags": {"playground": "roundabout"}, "name": "Play Roundabout", "terms": ["merry-go-round"]},
+    "playground/roundabout": {"icon": "maki-stadium", "fields": ["{playground}", "bench"], "geometry": ["point", "area"], "tags": {"playground": "roundabout"}, "name": "Play Roundabout", "terms": ["merry-go-round"]},
     "playground/sandpit": {"icon": "maki-playground", "geometry": ["point", "area"], "tags": {"playground": "sandpit"}, "name": "Sandpit"},
     "playground/seesaw": {"icon": "maki-playground", "geometry": ["point"], "tags": {"playground": "seesaw"}, "name": "Seesaw"},
     "playground/slide": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "slide"}, "name": "Slide"},
     "playground/structure": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"playground": "structure"}, "name": "Play Structure"},
-    "playground/swing": {"icon": "maki-playground", "fields": ["capacity", "playground/baby", "wheelchair"], "geometry": ["point"], "tags": {"playground": "swing"}, "name": "Swing"},
+    "playground/swing": {"icon": "maki-playground", "fields": ["capacity", "baby_seat", "wheelchair"], "geometry": ["point"], "tags": {"playground": "swing"}, "name": "Swing"},
     "playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "name": "Zip Wire"},
     "point": {"fields": ["name"], "geometry": ["vertex", "point"], "tags": {}, "terms": ["node", "other", "vertex", "vertices"], "name": "Point", "matchScore": 0.1},
     "polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"polling_station": "*"}, "matchScore": 0.75, "name": "Temporary Polling Place"},
@@ -980,7 +980,7 @@
     "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},
     "shop/agrarian": {"icon": "fas-tractor", "fields": ["{shop}", "agrarian"], "geometry": ["point", "area"], "terms": ["agricultural inputs", "agricultural machines", "seeds", "pesticides", "fertilizer", "agricultural tools"], "tags": {"shop": "agrarian"}, "name": "Farm Supply Shop"},
-    "shop/alcohol": {"icon": "fas-wine-bottle", "fields": ["{shop}", "drive_through"], "geometry": ["point", "area"], "terms": ["alcohol", "beer", "booze", "wine"], "tags": {"shop": "alcohol"}, "name": "Liquor Store"},
+    "shop/alcohol": {"icon": "fas-wine-bottle", "fields": ["{shop}", "drive_through"], "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beer", "booze", "wine"], "tags": {"shop": "alcohol"}, "name": "Liquor Store"},
     "shop/anime": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "anime"}, "terms": ["manga", "japan", "cosplay", "figurine", "dakimakura"], "name": "Anime Shop"},
     "shop/antiques": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "antiques"}, "name": "Antiques Shop"},
     "shop/appliance": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["air conditioner", "appliance", "dishwasher", "dryer", "freezer", "fridge", "grill", "kitchen", "oven", "refrigerator", "stove", "washer", "washing machine"], "tags": {"shop": "appliance"}, "name": "Appliance Store"},
@@ -996,11 +996,11 @@
     "shop/beverages": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages"}, "terms": ["drinks"], "name": "Beverage Store"},
     "shop/bicycle": {"icon": "maki-bicycle", "fields": ["{shop}", "service/bicycle"], "geometry": ["point", "area"], "terms": ["bike", "repair", "tricycle", "unicycle"], "tags": {"shop": "bicycle"}, "name": "Bicycle Shop"},
     "shop/boat": {"icon": "temaki-boating", "geometry": ["point", "area"], "terms": ["fishing boat", "jetski", "motorboat", "rowboat", "sailboat", "vessel", "watercraft"], "tags": {"shop": "boat"}, "name": "Boat Store"},
-    "shop/bookmaker": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"},
+    "shop/bookmaker": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"},
     "shop/books": {"icon": "fas-book", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"},
     "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["chicken", "beef", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"},
     "shop/candles": {"icon": "fas-burn", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "terms": ["wax"], "name": "Candle Shop"},
-    "shop/cannabis": {"icon": "fas-cannabis", "geometry": ["point", "area"], "terms": ["420", "marijuana", "pot", "reefer", "weed"], "tags": {"shop": "cannabis"}, "name": "Cannabis Shop"},
+    "shop/cannabis": {"icon": "fas-cannabis", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["420", "marijuana", "pot", "reefer", "weed"], "tags": {"shop": "cannabis"}, "name": "Cannabis Shop"},
     "shop/car_parts": {"icon": "fas-car-battery", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"},
     "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
     "shop/car": {"icon": "maki-car", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car"}, "name": "Car Dealership"},
@@ -1027,9 +1027,9 @@
     "shop/department_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store"}, "name": "Department Store"},
     "shop/doityourself": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "doityourself"}, "name": "DIY Store"},
     "shop/dry_cleaning": {"icon": "temaki-clothes_hanger", "geometry": ["point", "area"], "tags": {"shop": "dry_cleaning"}, "name": "Dry Cleaner"},
-    "shop/e-cigarette": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "e-cigarette"}, "terms": ["electronic", "vape", "vaping", "vapor"], "name": "E-Cigarette Shop"},
+    "shop/e-cigarette": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "e-cigarette"}, "terms": ["electronic", "vape", "vaping", "vapor"], "name": "E-Cigarette Shop"},
     "shop/electronics": {"icon": "fas-plug", "geometry": ["point", "area"], "terms": ["appliance", "audio", "blueray", "camera", "computer", "dvd", "home theater", "radio", "speaker", "tv", "video"], "tags": {"shop": "electronics"}, "name": "Electronics Store"},
-    "shop/erotic": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic"}, "name": "Erotic Store"},
+    "shop/erotic": {"icon": "maki-shop", "fields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic"}, "name": "Erotic Store"},
     "shop/erotic/lgbtq": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic", "lgbtq": "primary"}, "name": "LGBTQ+ Erotic Store"},
     "shop/fabric": {"icon": "fas-tape", "geometry": ["point", "area"], "terms": ["sew"], "tags": {"shop": "fabric"}, "name": "Fabric Store"},
     "shop/farm": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["farm shop", "farm stand"], "tags": {"shop": "farm"}, "name": "Produce Stand"},
@@ -1108,11 +1108,11 @@
     "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["diet_multi", "{shop}"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop"], "tags": {"shop": "supermarket"}, "name": "Supermarket"},
     "shop/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "area"], "terms": ["hot tub equipment store", "hot tub maintenance store", "hot tub supply store", "pool shop", "pool store", "swimming pool equipment store", "swimming pool installation store", "swimming pool maintenance store", "swimming pool supply shop"], "tags": {"shop": "swimming_pool"}, "name": "Pool Supply Store"},
     "shop/tailor": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "terms": ["clothes", "suit"], "tags": {"shop": "tailor"}, "name": "Tailor"},
-    "shop/tattoo": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "tattoo"}, "terms": ["ink"], "name": "Tattoo Parlor"},
+    "shop/tattoo": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tattoo"}, "terms": ["ink"], "name": "Tattoo Parlor"},
     "shop/tea": {"icon": "maki-teahouse", "geometry": ["point", "area"], "tags": {"shop": "tea"}, "name": "Tea Store"},
     "shop/ticket": {"icon": "fas-ticket-alt", "geometry": ["point", "area"], "tags": {"shop": "ticket"}, "terms": ["box office"], "name": "Ticket Seller"},
     "shop/tiles": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "tiles"}, "name": "Tile Shop"},
-    "shop/tobacco": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "tobacco"}, "terms": ["cigarettes", "cigars"], "name": "Tobacco Shop"},
+    "shop/tobacco": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tobacco"}, "terms": ["cigarettes", "cigars"], "name": "Tobacco Shop"},
     "shop/toys": {"icon": "fas-space-shuttle", "geometry": ["point", "area"], "tags": {"shop": "toys"}, "terms": ["games"], "name": "Toy Store"},
     "shop/trade": {"icon": "maki-shop", "fields": ["name", "trade", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "trade"}, "name": "Trade Shop"},
     "shop/travel_agency": {"icon": "fas-suitcase", "geometry": ["point", "area"], "tags": {"shop": "travel_agency"}, "name": "Travel Agency"},
@@ -1120,14 +1120,14 @@
     "shop/vacuum_cleaner": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "vacuum_cleaner"}, "name": "Vacuum Cleaner Store"},
     "shop/variety_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "variety_store"}, "name": "Variety Store"},
     "shop/video_games": {"icon": "maki-gaming", "geometry": ["point", "area"], "tags": {"shop": "video_games"}, "name": "Video Game Store"},
-    "shop/video": {"icon": "temaki-movie_rental", "geometry": ["point", "area"], "terms": ["DVD", "VHS", "video casette"], "tags": {"shop": "video"}, "name": "Video Store"},
+    "shop/video": {"icon": "temaki-movie_rental", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["DVD", "VHS", "video casette"], "tags": {"shop": "video"}, "name": "Video Store"},
     "shop/watches": {"icon": "maki-watch", "geometry": ["point", "area"], "tags": {"shop": "watches"}, "name": "Watches Shop"},
     "shop/water_sports": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "water_sports"}, "name": "Watersport/Swim Shop"},
     "shop/water": {"icon": "tnp-2009234", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"},
     "shop/weapons": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["ammo", "gun", "knife", "knives"], "tags": {"shop": "weapons"}, "name": "Weapon Shop"},
     "shop/wholesale": {"icon": "maki-warehouse", "fields": ["{shop}", "wholesale"], "geometry": ["point", "area"], "terms": ["warehouse club", "cash and carry"], "tags": {"shop": "wholesale"}, "name": "Wholesale Store"},
     "shop/window_blind": {"icon": "temaki-window", "geometry": ["point", "area"], "tags": {"shop": "window_blind"}, "name": "Window Blind Store"},
-    "shop/wine": {"icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"},
+    "shop/wine": {"icon": "maki-alcohol-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"},
     "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"},
     "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"},
     "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "height_building", "email", "fax", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"},

data/presets/presets/_attraction.json

@@ -4,18 +4,18 @@
         "name",
         "attraction",
         "operator",
-        "opening_hours"
-    ],
-    "moreFields": [
-        "charge_fee",
         "opening_hours",
         "fee",
-        "payment_multi",
+        "charge_fee"
+    ],
+    "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "opening_hours",
+        "payment_multi",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",

data/presets/presets/_playground.json

@@ -1,7 +1,11 @@
 {
     "icon": "maki-playground",
     "fields": [
-        "playground"
+        "playground",
+        "min_age",
+        "max_age",
+        "wheelchair",
+        "height"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/bar.json

@@ -5,6 +5,7 @@
         "address",
         "building_area",
         "outdoor_seating",
+        "min_age",
         "brewery"
     ],
     "moreFields": [

data/presets/presets/amenity/cafe.json

@@ -18,6 +18,7 @@
         "email",
         "fax",
         "internet_access/ssid",
+        "min_age",
         "not/name",
         "opening_hours",
         "payment_multi",

data/presets/presets/amenity/casino.json

@@ -15,6 +15,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "min_age",
         "payment_multi",
         "phone",
         "website",

data/presets/presets/amenity/childcare.json

@@ -9,11 +9,13 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "min_age",
+        "max_age",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/amenity/cinema.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "min_age",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/amenity/events_venue.json

@@ -6,14 +6,15 @@
         "building_area",
         "address",
         "website",
-        "internet_access"
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
     ],
     "moreFields" : [
         "air_conditioning",
         "email",
         "fax",
-        "internet_access/fee",
-        "internet_access/ssid",
+        "min_age",
         "phone",
         "smoking",
         "wheelchair"

data/presets/presets/amenity/karaoke.json

@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "min_age",
         "payment_multi",
         "phone",
         "smoking",

data/presets/presets/amenity/kindergarten.json

@@ -10,6 +10,8 @@
     "moreFields": [
         "email",
         "fax",
+        "min_age",
+        "max_age",
         "opening_hours",
         "payment_multi",
         "website",

data/presets/presets/amenity/love_hotel.json

@@ -7,16 +7,17 @@
         "building_area",
         "rooms",
         "internet_access",
-        "internet_access/fee"
+        "internet_access/fee",
+        "internet_access/ssid"
     ],
     "moreFields" : [
-        "smoking",
-        "payment_multi",
-        "internet_access/ssid",
-        "website",
-        "phone",
         "email",
         "fax",
+        "min_age",
+        "payment_multi",
+        "phone",
+        "smoking",
+        "website",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/amenity/nightclub.json

@@ -6,15 +6,16 @@
         "address",
         "building_area",
         "opening_hours",
+        "min_age",
         "smoking"
     ],
     "moreFields": [
         "air_conditioning",
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/amenity/pub.json

@@ -17,6 +17,7 @@
         "internet_access/fee",
         "internet_access/ssid",
         "microbrewery",
+        "min_age",
         "outdoor_seating",
         "payment_multi",
         "phone",

data/presets/presets/amenity/restaurant.json

@@ -21,6 +21,7 @@
         "internet_access/fee",
         "internet_access/ssid",
         "microbrewery",
+        "min_age",
         "not/name",
         "outdoor_seating",
         "reservation",

data/presets/presets/amenity/theatre.json

@@ -4,18 +4,19 @@
 	    "name",
         "operator",
         "address",
-        "building_area"
+        "building_area",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "min_age",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/amenity/vending_machine/cigarettes.json

@@ -1,5 +1,9 @@
 {
     "icon": "temaki-vending_machine",
+    "moreFields": [
+        "{amenity/vending_machine}",
+        "min_age"
+    ],
     "geometry": [
         "point"
     ],

data/presets/presets/attraction/amusement_ride.json

@@ -1,5 +1,10 @@
 {
     "icon": "maki-amusement-park",
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/attraction/big_wheel.json

@@ -4,6 +4,11 @@
         "{attraction}",
         "height"
     ],
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point"
     ],

data/presets/presets/attraction/bumper_car.json

@@ -1,5 +1,10 @@
 {
     "icon": "maki-car",
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/attraction/bungee_jumping.json

@@ -4,6 +4,11 @@
         "{attraction}",
         "height"
     ],
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/attraction/carousel.json

@@ -4,6 +4,11 @@
         "{attraction}",
         "building_area"
     ],
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/attraction/dark_ride.json

@@ -4,6 +4,11 @@
         "{attraction}",
         "building_area"
     ],
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "line",

data/presets/presets/attraction/drop_tower.json

@@ -4,6 +4,11 @@
         "{attraction}",
         "height"
     ],
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/attraction/maze.json

@@ -1,5 +1,10 @@
 {
     "icon": "maki-amusement-park",
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/attraction/pirate_ship.json

@@ -1,5 +1,10 @@
 {
     "icon": "maki-danger",
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point"
     ],

data/presets/presets/attraction/river_rafting.json

@@ -1,5 +1,10 @@
 {
     "icon": "maki-ferry",
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "line"

data/presets/presets/attraction/roller_coaster.json

@@ -1,5 +1,10 @@
 {
     "icon": "maki-amusement-park",
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/attraction/summer_toboggan.json

@@ -1,5 +1,10 @@
 {
     "icon": "temaki-sledding",
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "line"
     ],

data/presets/presets/attraction/water_slide.json

@@ -4,6 +4,11 @@
         "{attraction}",
         "height"
     ],
+    "moreFields": [
+        "{attraction}",
+        "max_age",
+        "min_age"
+    ],
     "geometry": [
         "line",
         "area"

data/presets/presets/club.json

@@ -17,6 +17,8 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "max_age",
+        "min_age",
         "phone",
         "website",
         "wheelchair"

data/presets/presets/craft/brewery.json

@@ -4,6 +4,10 @@
         "{craft}",
         "product"
     ],
+    "moreFields": [
+        "{craft}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/craft/distillery.json

@@ -4,6 +4,10 @@
         "{craft}",
         "product"
     ],
+    "moreFields": [
+        "{craft}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/craft/winery.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-alcohol-shop",
+    "moreFields": [
+        "{craft}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/leisure/amusement_arcade.json

@@ -8,13 +8,16 @@
     ],
     "moreFields": [
         "air_conditioning",
+        "email",
+        "fax",
+        "max_age",
+        "min_age",
         "opening_hours",
         "payment_multi",
+        "phone",
         "smoking",
         "website",
-        "phone",
-        "email",
-        "fax"
+        "wheelchair"
     ],
     "geometry": [
         "point",

data/presets/presets/leisure/bowling_alley.json

@@ -8,13 +8,15 @@
     ],
     "moreFields": [
         "air_conditioning",
+        "email",
+        "fax",
+        "min_age",
         "opening_hours",
         "payment_multi",
+        "phone",
         "smoking",
         "website",
-        "phone",
-        "email",
-        "fax"
+        "wheelchair"
     ],
     "geometry": [
         "point",

data/presets/presets/leisure/playground.json

@@ -4,8 +4,8 @@
         "name",
         "operator",
         "surface",
-        "playground/max_age",
-        "playground/min_age",
+        "min_age",
+        "max_age",
         "access_simple"
     ],
     "geometry": [

data/presets/presets/playground/horizontal_bar.json

@@ -1,8 +1,5 @@
 {
     "icon": "maki-pitch",
-    "fields": [
-        "height"
-    ],
     "geometry": [
         "point"
     ],

data/presets/presets/playground/roundabout.json

@@ -1,6 +1,7 @@
 {
     "icon": "maki-stadium",
     "fields": [
+        "{playground}",
         "bench"
     ],
     "geometry": [

data/presets/presets/playground/swing.json

@@ -2,7 +2,7 @@
     "icon": "maki-playground",
     "fields": [
         "capacity",
-        "playground/baby",
+        "baby_seat",
         "wheelchair"
     ],
     "geometry": [

data/presets/presets/shop/alcohol.json

@@ -4,6 +4,10 @@
         "{shop}",
         "drive_through"
     ],
+    "moreFields": [
+        "{shop}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/bookmaker.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-shop",
+    "moreFields": [
+        "{shop}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/cannabis.json

@@ -1,5 +1,9 @@
 {
     "icon": "fas-cannabis",
+    "moreFields": [
+        "{shop}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/e-cigarette.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-shop",
+    "moreFields": [
+        "{shop}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/erotic.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-shop",
+    "fields": [
+        "{shop}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/tattoo.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-shop",
+    "moreFields": [
+        "{shop}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/tobacco.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-shop",
+    "moreFields": [
+        "{shop}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/video.json

@@ -1,5 +1,9 @@
 {
     "icon": "temaki-movie_rental",
+    "moreFields": [
+        "{shop}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/wine.json

@@ -1,5 +1,9 @@
 {
     "icon": "maki-alcohol-shop",
+    "moreFields": [
+        "{shop}",
+        "min_age"
+    ],
     "geometry": [
         "point",
         "area"

data/taginfo.json

@@ -1249,6 +1249,7 @@
     {"key": "artist_name", "description": "🄵 Artist"},
     {"key": "artwork_type", "description": "🄵 Type"},
     {"key": "atm", "description": "🄵 ATM"},
+    {"key": "baby", "description": "🄵 Baby Seat"},
     {"key": "backrest", "description": "🄵 Backrest"},
     {"key": "bar", "description": "🄵 Bar"},
     {"key": "basin", "description": "🄵 Type"},
@@ -1491,6 +1492,7 @@
     {"key": "map_size", "description": "🄵 Coverage"},
     {"key": "map_type", "description": "🄵 Type"},
     {"key": "material", "description": "🄵 Material"},
+    {"key": "max_age", "description": "🄵 Maximum Age"},
     {"key": "maxheight", "description": "🄵 Max Height"},
     {"key": "maxspeed", "description": "🄵 Speed Limit"},
     {"key": "maxspeed:advisory", "description": "🄵 Advisory Speed Limit"},
@@ -1498,6 +1500,7 @@
     {"key": "maxweight", "description": "🄵 Max Weight"},
     {"key": "memorial", "description": "🄵 Type"},
     {"key": "microbrewery", "description": "🄵 Microbrewery"},
+    {"key": "min_age", "description": "🄵 Minimum Age"},
     {"key": "minspeed", "description": "🄵 Minimum Speed Limit"},
     {"key": "monitoring:", "description": "🄵 Monitoring"},
     {"key": "mtb:scale", "value": "0", "description": "🄵 Mountain Biking Difficulty"},
@@ -1572,9 +1575,6 @@
     {"key": "piste:type", "value": "connection", "description": "🄵 Type"},
     {"key": "plant", "description": "🄵 Plant"},
     {"key": "plant:output:electricity", "description": "🄵 Power Output"},
-    {"key": "baby", "description": "🄵 Baby Seat"},
-    {"key": "max_age", "description": "🄵 Maximum Age"},
-    {"key": "min_age", "description": "🄵 Minimum Age"},
     {"key": "population", "description": "🄵 Population"},
     {"key": "post:block_number", "description": "🄵 Delivery Address"},
     {"key": "post:city", "description": "🄵 Delivery Address"},
@@ -1943,7 +1943,9 @@
     {"key": "man_made", "value": "water_tank", "description": "🄳 ➜ man_made=storage_tank + content=water"},
     {"key": "man_made", "value": "well", "description": "🄳 ➜ man_made=water_well"},
     {"key": "man_made", "value": "winery", "description": "🄳 ➜ craft=winery"},
+    {"key": "maxage", "description": "🄳 ➜ max_age=*"},
     {"key": "memorial", "value": "plate", "description": "🄳 ➜ memorial=plaque"},
+    {"key": "minage", "description": "🄳 ➜ min_age=*"},
     {"key": "mining_resource", "description": "🄳 ➜ resource=*"},
     {"key": "natural", "value": "marsh", "description": "🄳 ➜ natural=wetland + wetland=marsh"},
     {"key": "natural", "value": "waterfall", "description": "🄳 ➜ waterway=waterfall"},

dist/locales/en.json

@@ -2622,6 +2622,10 @@
                     "label": "Type",
                     "terms": ""
                 },
+                "baby_seat": {
+                    "label": "Baby Seat",
+                    "terms": ""
+                },
                 "backrest": {
                     "label": "Backrest",
                     "terms": ""
@@ -3605,6 +3609,10 @@
                     "label": "Material",
                     "terms": ""
                 },
+                "max_age": {
+                    "label": "Maximum Age",
+                    "terms": "upper age limit"
+                },
                 "maxheight": {
                     "label": "Max Height",
                     "terms": "",
@@ -3640,6 +3648,10 @@
                     "label": "Microbrewery",
                     "terms": "brewpub,craft beer"
                 },
+                "min_age": {
+                    "label": "Minimum Age",
+                    "terms": "lower age limit"
+                },
                 "minspeed": {
                     "label": "Minimum Speed Limit",
                     "terms": "",
@@ -3964,18 +3976,6 @@
                     "label": "Type",
                     "terms": ""
                 },
-                "playground/baby": {
-                    "label": "Baby Seat",
-                    "terms": ""
-                },
-                "playground/max_age": {
-                    "label": "Maximum Age",
-                    "terms": ""
-                },
-                "playground/min_age": {
-                    "label": "Minimum Age",
-                    "terms": ""
-                },
                 "polling_station": {
                     "label": "Polling Place",
                     "terms": "voting place"