diff --git a/data/presets/presets.json b/data/presets/presets.json
index c032e2050..23a674734 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -48,7 +48,7 @@
     "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
     "amenity/bank": {"icon": "maki-bank", "fields": ["name", "atm", "operator", "address", "building_area", "opening_hours", "drive_through"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
     "amenity/bar": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking", "outdoor_seating", "brewery"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
-    "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
+    "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
     "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest"], "geometry": ["point", "vertex", "line"], "terms": ["seat"], "tags": {"amenity": "bench"}, "name": "Bench"},
     "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
     "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "payment_multi"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
@@ -88,7 +88,7 @@
     "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "denomination"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
     "amenity/grit_bin": {"fields": ["access_simple"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
     "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "emergency"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "removeTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
-    "amenity/hunting_stand": {"icon": "temaki-binoculars", "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
+    "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
     "amenity/ice_cream": {"icon": "maki-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "takeaway", "delivery", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
     "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
@@ -128,7 +128,7 @@
     "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "water_point"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
     "amenity/school": {"icon": "maki-school", "fields": ["name", "operator", "address", "religion", "denomination"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
     "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
-    "amenity/shower": {"icon": "temaki-shower", "fields": ["operator", "opening_hours", "fee", "supervised", "building_area"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
+    "amenity/shower": {"icon": "temaki-shower", "fields": ["operator", "opening_hours", "fee", "supervised", "building_area", "access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
     "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
     "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
     "amenity/social_facility/food_bank": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility", "social_facility": "food_bank"}, "reference": {"key": "social_facility", "value": "food_bank"}, "name": "Food Bank"},
@@ -470,7 +470,7 @@
     "leisure/dance": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style", "opening_hours"], "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", "opening_hours", "dance/style"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"},
     "leisure/dog_park": {"icon": "maki-dog-park", "geometry": ["point", "area"], "fields": ["name"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
-    "leisure/firepit": {"icon": "maki-fire-station", "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
+    "leisure/firepit": {"icon": "maki-fire-station", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
     "leisure/fitness_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"},
     "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["studio"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
     "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "removeTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"},
@@ -516,7 +516,7 @@
     "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "name": "Resort"},
     "leisure/running_track": {"icon": "maki-pitch", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["race*", "running", "sprint", "track"], "name": "Racetrack (Running)"},
     "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
-    "leisure/slipway": {"icon": "temaki-beach", "geometry": ["point", "line"], "terms": ["boat launch", "boat ramp"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
+    "leisure/slipway": {"icon": "temaki-beach", "fields": ["access_simple"], "geometry": ["point", "line"], "terms": ["boat launch", "boat ramp"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
     "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
     "leisure/sports_centre/swimming": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address", "building"], "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"},
     "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
@@ -876,7 +876,7 @@
     "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
     "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"},
     "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "attraction"}, "name": "Tourist Attraction"},
-    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "capacity", "fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
+    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
     "tourism/caravan_site": {"icon": "maki-bus", "fields": ["name", "operator", "address", "capacity", "fee", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
     "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "smoking", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
     "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
@@ -890,7 +890,7 @@
     "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
     "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
     "tourism/museum": {"icon": "maki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
-    "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "smoking"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
+    "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity", "smoking"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
     "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
     "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage", "address", "phone", "website", "description"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
     "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
@@ -4312,8 +4312,8 @@
     "tourism/attraction/Хозяйственный двор": {"tags": {"name": "Хозяйственный двор", "tourism": "attraction"}, "name": "Хозяйственный двор", "icon": "maki-star", "geometry": ["point", "vertex", "area"], "fields": ["name", "operator", "address"], "suggestion": true},
     "tourism/attraction/Часовня": {"tags": {"name": "Часовня", "tourism": "attraction"}, "name": "Часовня", "icon": "maki-star", "geometry": ["point", "vertex", "area"], "fields": ["name", "operator", "address"], "suggestion": true},
     "tourism/attraction/дольмен": {"tags": {"name": "дольмен", "tourism": "attraction"}, "name": "дольмен", "icon": "maki-star", "geometry": ["point", "vertex", "area"], "fields": ["name", "operator", "address"], "suggestion": true},
-    "tourism/camp_site/Camping Municipal": {"tags": {"name": "Camping Municipal", "tourism": "camp_site"}, "name": "Camping Municipal", "icon": "maki-campsite", "geometry": ["point", "vertex", "area"], "fields": ["name", "operator", "address", "capacity", "fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "suggestion": true},
-    "tourism/camp_site/Camping municipal": {"tags": {"name": "Camping municipal", "tourism": "camp_site"}, "name": "Camping municipal", "icon": "maki-campsite", "geometry": ["point", "vertex", "area"], "fields": ["name", "operator", "address", "capacity", "fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "suggestion": true},
+    "tourism/camp_site/Camping Municipal": {"tags": {"name": "Camping Municipal", "tourism": "camp_site"}, "name": "Camping Municipal", "icon": "maki-campsite", "geometry": ["point", "vertex", "area"], "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "suggestion": true},
+    "tourism/camp_site/Camping municipal": {"tags": {"name": "Camping municipal", "tourism": "camp_site"}, "name": "Camping municipal", "icon": "maki-campsite", "geometry": ["point", "vertex", "area"], "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "suggestion": true},
     "tourism/guest_house/Home": {"tags": {"name": "Home", "tourism": "guest_house"}, "name": "Home", "icon": "maki-lodging", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "suggestion": true},
     "tourism/guest_house/OW Bielanka": {"tags": {"name": "OW Bielanka", "tourism": "guest_house"}, "name": "OW Bielanka", "icon": "maki-lodging", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "suggestion": true},
     "tourism/hostel/Albergue de Peregrinos": {"tags": {"name": "Albergue de Peregrinos", "tourism": "hostel"}, "name": "Albergue de Peregrinos", "icon": "maki-lodging", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "suggestion": true},
diff --git a/data/presets/presets/amenity/bbq.json b/data/presets/presets/amenity/bbq.json
index 7a5efffef..3ce13554d 100644
--- a/data/presets/presets/amenity/bbq.json
+++ b/data/presets/presets/amenity/bbq.json
@@ -2,7 +2,8 @@
     "icon": "maki-bbq",
     "fields": [
         "covered",
-        "fuel"
+        "fuel",
+        "access_simple"
     ],
     "geometry": [
         "point"
diff --git a/data/presets/presets/amenity/hunting_stand.json b/data/presets/presets/amenity/hunting_stand.json
index 34d696e8f..00e3a754e 100644
--- a/data/presets/presets/amenity/hunting_stand.json
+++ b/data/presets/presets/amenity/hunting_stand.json
@@ -1,5 +1,8 @@
 {
     "icon": "temaki-binoculars",
+    "fields": [
+        "access_simple"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json
index 9584ec2f4..c6fd4f8ee 100644
--- a/data/presets/presets/amenity/shower.json
+++ b/data/presets/presets/amenity/shower.json
@@ -5,7 +5,8 @@
         "opening_hours",
         "fee",
         "supervised",
-        "building_area"
+        "building_area",
+        "access_simple"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/firepit.json b/data/presets/presets/leisure/firepit.json
index ae8fb256f..cbe165258 100644
--- a/data/presets/presets/leisure/firepit.json
+++ b/data/presets/presets/leisure/firepit.json
@@ -1,5 +1,8 @@
 {
     "icon": "maki-fire-station",
+    "fields": [
+        "access_simple"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/leisure/slipway.json b/data/presets/presets/leisure/slipway.json
index 82f3c0622..6dd0cc13b 100644
--- a/data/presets/presets/leisure/slipway.json
+++ b/data/presets/presets/leisure/slipway.json
@@ -1,5 +1,8 @@
 {
     "icon": "temaki-beach",
+    "fields": [
+        "access_simple"
+    ],
     "geometry": [
         "point",
         "line"
diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json
index 404166c1c..116bc2271 100644
--- a/data/presets/presets/tourism/camp_site.json
+++ b/data/presets/presets/tourism/camp_site.json
@@ -4,6 +4,7 @@
         "name",
         "operator",
         "address",
+        "access_simple",
         "capacity",
         "fee",
         "internet_access",
diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json
index 564838d47..b0e3c85c6 100644
--- a/data/presets/presets/tourism/picnic_site.json
+++ b/data/presets/presets/tourism/picnic_site.json
@@ -4,6 +4,8 @@
         "name",
         "operator",
         "address",
+        "access_simple",
+        "capacity",
         "smoking"
     ],
     "geometry": [