diff --git a/data/deprecated.json b/data/deprecated.json
index 7e0e5ebfe..2d021ca77 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -965,6 +965,10 @@
       "old": {"shop": "winery"},
       "replace": {"craft": "winery"}
     },
+    {
+      "old": {"showers": "*"},
+      "replace": {"shower": "$1"}
+    },
     {
       "old": {"sloped_curb": "0"},
       "replace": {"kerb": "flush"}
diff --git a/data/presets.yaml b/data/presets.yaml
index 4b4575632..26d0bad46 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -238,6 +238,10 @@ en:
       baby_seat:
         # baby=*
         label: Baby Seat
+      backcountry:
+        # backcountry=*
+        label: Backcountry
+        terms: '[translate with synonyms or related terms for ''Backcountry'', separated by commas]'
       backrest:
         # backrest=*
         label: Backrest
@@ -923,6 +927,10 @@ en:
       grape_variety:
         # grape_variety=*
         label: Grape Varieties
+      group_only:
+        # group_only=*
+        label: Groups Only
+        terms: '[translate with synonyms or related terms for ''Groups Only'', separated by commas]'
       guest_house:
         # guest_house=*
         label: Type
@@ -1024,6 +1032,9 @@ en:
           stables: 'Yes'
           # amenity=undefined
           undefined: 'No'
+      hot_water:
+        # hot_water=*
+        label: Hot Water
       iata:
         # iata=*
         label: IATA Airport Code
@@ -1496,6 +1507,10 @@ en:
           undefined: Assumed to be Yes
           # oneway=yes
           'yes': 'Yes'
+      openfire:
+        # openfire=*
+        label: Open Fires Allowed
+        terms: '[translate with synonyms or related terms for ''Open Fires Allowed'', separated by commas]'
       opening_date:
         # opening_date=*
         label: Expected Opening Date
@@ -2110,6 +2125,10 @@ en:
       shop:
         # shop=*
         label: Type
+      shower:
+        # shower=*
+        label: Showers
+        terms: '[translate with synonyms or related terms for ''Showers'', separated by commas]'
       siren/purpose:
         # 'siren:purpose=*'
         label: Purpose
@@ -2351,6 +2370,10 @@ en:
       to:
         # to=*
         label: To
+      toilets:
+        # toilets=*
+        label: Toilets
+        terms: '[translate with synonyms or related terms for ''Toilets'', separated by commas]'
       toilets/disposal:
         # 'toilets:disposal=*'
         label: Disposal
@@ -8126,8 +8149,18 @@ en:
       tourism/camp_site:
         # tourism=camp_site
         name: Campground
-        # 'terms: tent,rv'
+        # 'terms: caravans,camp ground,camp pitch,camp site,campers,campground,campsite,mobile homes,recreational vehicles,rv,tenting'
         terms: '<translate with synonyms or related terms for ''Campground'', separated by commas>'
+      tourism/camp_site/backcountry:
+        # 'tourism=camp_site, backcountry=yes'
+        name: Backcountry Camping Area
+        # 'terms: alpine camping,backpacking site,backwoods camping,camp ground,camp pitch,camp site,campground,campsite,informal camping,primitive camping'
+        terms: '<translate with synonyms or related terms for ''Backcountry Camping Area'', separated by commas>'
+      tourism/camp_site/group_only:
+        # 'tourism=camp_site, group_only=yes'
+        name: Group Camping Area
+        # 'terms: camp ground,camp pitch,camp site,campground,campsite,scout camping,youth camping'
+        terms: '<translate with synonyms or related terms for ''Group Camping Area'', separated by commas>'
       tourism/caravan_site:
         # tourism=caravan_site
         name: RV Park
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 44f121765..b07c68885 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -28,6 +28,7 @@
     "atm": {"key": "atm", "type": "check", "label": "ATM"},
     "attraction": {"key": "attraction", "type": "typeCombo", "label": "Type"},
     "baby_seat": {"key": "baby", "type": "check", "label": "Baby Seat"},
+    "backcountry": {"key": "backcountry", "type": "check", "label": "Backcountry"},
     "backrest": {"key": "backrest", "type": "check", "label": "Backrest"},
     "bar": {"key": "bar", "type": "check", "label": "Bar"},
     "barrier": {"key": "barrier", "type": "typeCombo", "label": "Type"},
@@ -168,6 +169,7 @@
     "gnis/feature_id": {"key": "gnis:feature_id", "type": "identifier", "label": "GNIS Feature ID", "urlFormat": "https://geonames.usgs.gov/apex/f?p=gnispq:3:::NO::P3_FID:{value}", "pattern": "^[0-9]{1,}$", "countryCodes": ["us"], "terms": ["Federal Geographic Names Information Service", "United States Board on Geographic Names", "USA"]},
     "government": {"key": "government", "type": "typeCombo", "label": "Type"},
     "grape_variety": {"key": "grape_variety", "type": "semiCombo", "label": "Grape Varieties"},
+    "group_only": {"key": "group_only", "type": "check", "label": "Groups Only"},
     "guest_house": {"key": "guest_house", "type": "combo", "label": "Type"},
     "handicap": {"key": "handicap", "type": "number", "label": "Handicap", "placeholder": "1-18"},
     "handrail": {"key": "handrail", "type": "check", "label": "Handrail"},
@@ -188,6 +190,7 @@
     "horse_riding": {"key": "leisure", "type": "check", "label": "Horseback Riding", "strings": {"options": {"undefined": "No", "horse_riding": "Yes"}}, "reference": {"key": "leisure", "value": "horse_riding"}},
     "horse_scale": {"key": "horse_scale", "type": "combo", "label": "Horseback Riding Difficulty", "placeholder": "Difficult, Dangerous...", "strings": {"options": {"common": "Easy: No problems or difficulties. (default)", "demanding": "Use with caution: Uneven way, occasional difficult passages.", "difficult": "Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.", "critical": "Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.", "dangerous": "Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.", "impossible": "Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life."}}},
     "horse_stables": {"key": "amenity", "type": "check", "label": "Riding Stable", "strings": {"options": {"undefined": "No", "stables": "Yes"}}, "reference": {"key": "amenity", "value": "stables"}},
+    "hot_water": {"key": "hot_water", "type": "check", "label": "Hot Water"},
     "iata": {"key": "iata", "type": "text", "label": "IATA Airport Code"},
     "icao": {"key": "icao", "type": "text", "label": "ICAO Airport Code"},
     "incline_steps": {"key": "incline", "type": "combo", "label": "Incline", "strings": {"options": {"up": "Up", "down": "Down"}}},
@@ -267,6 +270,7 @@
     "oneway_yes": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be Yes", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}},
     "oneway": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be No", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}},
     "oneway/bicycle": {"key": "oneway:bicycle", "type": "check", "label": "One Way (Bicycles)", "prerequisiteTag": {"key": "oneway"}},
+    "openfire": {"key": "openfire", "type": "check", "label": "Open Fires Allowed"},
     "opening_date": {"key": "opening_date", "type": "text", "label": "Expected Opening Date"},
     "opening_hours": {"key": "opening_hours", "type": "combo", "label": "Hours", "placeholder": "Unknown", "snake_case": false},
     "operator": {"key": "operator", "type": "text", "label": "Operator"},
@@ -366,6 +370,7 @@
     "shelter_type": {"key": "shelter_type", "type": "combo", "label": "Type"},
     "shelter": {"key": "shelter", "type": "check", "label": "Shelter"},
     "shop": {"key": "shop", "type": "typeCombo", "label": "Type"},
+    "shower": {"key": "shower", "type": "check", "label": "Showers"},
     "siren/purpose": {"key": "siren:purpose", "type": "combo", "label": "Purpose"},
     "siren/type": {"key": "siren:type", "type": "combo", "label": "Type", "strings": {"options": {"pneumatic": "Pneumatic", "electronic": "Electronic", "other": "Other"}}},
     "site_type": {"key": "site_type", "type": "combo", "label": "Site Type"},
@@ -407,6 +412,7 @@
     "target": {"key": "target", "type": "combo", "label": "Target"},
     "tidal": {"key": "tidal", "type": "check", "label": "Tidal"},
     "to": {"key": "to", "type": "text", "label": "To"},
+    "toilets": {"key": "toilets", "type": "check", "label": "Toilets"},
     "toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit Latrine", "chemical": "Chemical", "bucket": "Bucket"}}},
     "toilets/handwashing": {"key": "toilets:handwashing", "type": "check", "label": "Handwashing"},
     "toilets/position": {"key": "toilets:position", "type": "semiCombo", "label": "Positions"},
diff --git a/data/presets/fields/backcountry.json b/data/presets/fields/backcountry.json
new file mode 100644
index 000000000..1fc3e16bb
--- /dev/null
+++ b/data/presets/fields/backcountry.json
@@ -0,0 +1,5 @@
+{
+    "key": "backcountry",
+    "type": "check",
+    "label": "Backcountry"
+}
diff --git a/data/presets/fields/group_only.json b/data/presets/fields/group_only.json
new file mode 100644
index 000000000..e61885bb2
--- /dev/null
+++ b/data/presets/fields/group_only.json
@@ -0,0 +1,5 @@
+{
+    "key": "group_only",
+    "type": "check",
+    "label": "Groups Only"
+}
diff --git a/data/presets/fields/hot_water.json b/data/presets/fields/hot_water.json
new file mode 100644
index 000000000..092d3a565
--- /dev/null
+++ b/data/presets/fields/hot_water.json
@@ -0,0 +1,5 @@
+{
+    "key": "hot_water",
+    "type": "check",
+    "label": "Hot Water"
+}
diff --git a/data/presets/fields/openfire.json b/data/presets/fields/openfire.json
new file mode 100644
index 000000000..ad416e36e
--- /dev/null
+++ b/data/presets/fields/openfire.json
@@ -0,0 +1,5 @@
+{
+    "key": "openfire",
+    "type": "check",
+    "label": "Open Fires Allowed"
+}
diff --git a/data/presets/fields/shower.json b/data/presets/fields/shower.json
new file mode 100644
index 000000000..9fc28b1c8
--- /dev/null
+++ b/data/presets/fields/shower.json
@@ -0,0 +1,5 @@
+{
+    "key": "shower",
+    "type": "check",
+    "label": "Showers"
+}
diff --git a/data/presets/fields/toilets.json b/data/presets/fields/toilets.json
new file mode 100644
index 000000000..56ee1764c
--- /dev/null
+++ b/data/presets/fields/toilets.json
@@ -0,0 +1,5 @@
+{
+    "key": "toilets",
+    "type": "check",
+    "label": "Toilets"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index bf580dd68..ce03de7af 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -215,7 +215,7 @@
     "amenity/shelter/lean_to": {"icon": "temaki-sleep_shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "terms": ["alpine hut", "cabin", "leanto", "lodging", "overnight accommodations", "sleeping shelter", "wilderness hut"], "name": "Lean-To"},
     "amenity/shelter/picnic_shelter": {"icon": "temaki-picnic_shelter", "fields": ["name", "shelter_type", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"},
     "amenity/shelter/public_transport": {"icon": "temaki-transit_shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
-    "amenity/shower": {"icon": "temaki-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "wheelchair"], "moreFields": ["address", "gender", "level", "operator"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
+    "amenity/shower": {"icon": "temaki-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "hot_water", "wheelchair"], "moreFields": ["address", "gender", "level", "operator"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
     "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "moreFields": ["covered", "level", "lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
     "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "brand", "operator", "operator/type", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"},
     "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "operator/type", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
@@ -1189,7 +1189,9 @@
     "tourism/artwork/statue": {"icon": "temaki-statue", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"},
     "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "attraction"}, "matchScore": 0.75, "name": "Tourist Attraction"},
     "tourism/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_pitch"}, "name": "Camp Pitch"},
-    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "power_supply", "ref/vatin", "reservation", "sanitary_dump_station", "website", "wheelchair"], "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", "payment_multi_fee", "charge_fee"], "moreFields": ["backcountry", "dog", "email", "fax", "gnis/feature_id", "group_only", "internet_access", "internet_access/fee", "internet_access/ssid", "openfire", "opening_hours", "phone", "power_supply", "ref/vatin", "reservation", "sanitary_dump_station", "shower", "stars", "toilets", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "camp_site"}, "terms": ["caravans", "camp ground", "camp pitch", "camp site", "campers", "campground", "campsite", "mobile homes", "recreational vehicles", "rv", "tenting"], "name": "Campground"},
+    "tourism/camp_site/backcountry": {"icon": "maki-campsite", "geometry": ["point", "vertex", "area"], "tags": {"tourism": "camp_site", "backcountry": "yes"}, "reference": {"key": "backcountry"}, "terms": ["alpine camping", "backpacking site", "backwoods camping", "camp ground", "camp pitch", "camp site", "campground", "campsite", "informal camping", "primitive camping"], "name": "Backcountry Camping Area"},
+    "tourism/camp_site/group_only": {"icon": "maki-campsite", "geometry": ["point", "vertex", "area"], "tags": {"tourism": "camp_site", "group_only": "yes"}, "reference": {"key": "group_only"}, "terms": ["camp ground", "camp pitch", "camp site", "campground", "campsite", "scout camping", "youth camping"], "name": "Group Camping Area"},
     "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access/ssid", "operator", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
     "tourism/chalet": {"icon": "temaki-cabin", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["chalet", "holiday cabin", "holiday cottage", "holiday home", "lodge", "lodging", "overnight accommodations", "vacation cabin", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
     "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json
index 22643524c..dc297f77d 100644
--- a/data/presets/presets/amenity/shower.json
+++ b/data/presets/presets/amenity/shower.json
@@ -8,6 +8,7 @@
         "charge_fee",
         "supervised",
         "building_area",
+        "hot_water",
         "wheelchair"
     ],
     "moreFields": [
diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json
index beaec6e8b..fd3b6f17f 100644
--- a/data/presets/presets/tourism/camp_site.json
+++ b/data/presets/presets/tourism/camp_site.json
@@ -8,20 +8,28 @@
         "capacity",
         "fee",
         "payment_multi_fee",
-        "charge_fee",
-        "internet_access",
-        "internet_access/fee"
+        "charge_fee"
     ],
     "moreFields": [
+        "backcountry",
+        "dog",
         "email",
         "fax",
         "gnis/feature_id",
+        "group_only",
+        "internet_access",
+        "internet_access/fee",
         "internet_access/ssid",
+        "openfire",
+        "opening_hours",
         "phone",
         "power_supply",
         "ref/vatin",
         "reservation",
         "sanitary_dump_station",
+        "shower",
+        "stars",
+        "toilets",
         "website",
         "wheelchair"
     ],
@@ -30,12 +38,21 @@
         "vertex",
         "area"
     ],
-    "terms": [
-        "tent",
-        "rv"
-    ],
     "tags": {
         "tourism": "camp_site"
     },
+    "terms": [
+        "caravans",
+        "camp ground",
+        "camp pitch",
+        "camp site",
+        "campers",
+        "campground",
+        "campsite",
+        "mobile homes",
+        "recreational vehicles",
+        "rv",
+        "tenting"
+    ],
     "name": "Campground"
 }
diff --git a/data/presets/presets/tourism/camp_site/backcountry.json b/data/presets/presets/tourism/camp_site/backcountry.json
new file mode 100644
index 000000000..bd463498b
--- /dev/null
+++ b/data/presets/presets/tourism/camp_site/backcountry.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-campsite",
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "tourism": "camp_site",
+        "backcountry": "yes"
+    },
+    "reference": {
+        "key": "backcountry"
+    },
+    "terms": [
+        "alpine camping",
+        "backpacking site",
+        "backwoods camping",
+        "camp ground",
+        "camp pitch",
+        "camp site",
+        "campground",
+        "campsite",
+        "informal camping",
+        "primitive camping"
+    ],
+    "name": "Backcountry Camping Area"
+}
diff --git a/data/presets/presets/tourism/camp_site/group_only.json b/data/presets/presets/tourism/camp_site/group_only.json
new file mode 100644
index 000000000..e063d2c0e
--- /dev/null
+++ b/data/presets/presets/tourism/camp_site/group_only.json
@@ -0,0 +1,25 @@
+{
+    "icon": "maki-campsite",
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "tourism": "camp_site",
+        "group_only": "yes"
+    },
+    "reference": {
+        "key": "group_only"
+    },
+    "terms": [
+        "camp ground",
+        "camp pitch",
+        "camp site",
+        "campground",
+        "campsite",
+        "scout camping",
+        "youth camping"
+    ],
+    "name": "Group Camping Area"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 34b27c5cd..df08b0b45 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1133,6 +1133,8 @@
     {"key": "tourism", "value": "attraction", "description": "🄿 Tourist Attraction", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/star-15.svg"},
     {"key": "tourism", "value": "camp_pitch", "description": "🄿 Camp Pitch", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"},
     {"key": "tourism", "value": "camp_site", "description": "🄿 Campground", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"},
+    {"key": "backcountry", "value": "yes", "description": "🄿 Backcountry Camping Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"},
+    {"key": "group_only", "value": "yes", "description": "🄿 Group Camping Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"},
     {"key": "tourism", "value": "caravan_site", "description": "🄿 RV Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rv_park.svg"},
     {"key": "tourism", "value": "chalet", "description": "🄿 Holiday Cottage", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cabin.svg"},
     {"key": "tourism", "value": "gallery", "description": "🄿 Art Gallery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
@@ -1307,6 +1309,7 @@
     {"key": "artwork_type", "description": "🄵 Type"},
     {"key": "atm", "description": "🄵 ATM"},
     {"key": "baby", "description": "🄵 Baby Seat"},
+    {"key": "backcountry", "description": "🄵 Backcountry"},
     {"key": "backrest", "description": "🄵 Backrest"},
     {"key": "bar", "description": "🄵 Bar"},
     {"key": "basin", "description": "🄵 Type"},
@@ -1492,6 +1495,7 @@
     {"key": "gnis:feature_id", "description": "🄵 GNIS Feature ID"},
     {"key": "government", "description": "🄵 Type"},
     {"key": "grape_variety", "description": "🄵 Grape Varieties"},
+    {"key": "group_only", "description": "🄵 Groups Only"},
     {"key": "guest_house", "description": "🄵 Type"},
     {"key": "handicap", "description": "🄵 Handicap"},
     {"key": "handrail", "description": "🄵 Handrail"},
@@ -1511,6 +1515,7 @@
     {"key": "horse_scale", "value": "dangerous", "description": "🄵 Horseback Riding Difficulty"},
     {"key": "horse_scale", "value": "impossible", "description": "🄵 Horseback Riding Difficulty"},
     {"key": "amenity", "value": "stables", "description": "🄵 Riding Stable"},
+    {"key": "hot_water", "description": "🄵 Hot Water"},
     {"key": "iata", "description": "🄵 IATA Airport Code"},
     {"key": "icao", "description": "🄵 ICAO Airport Code"},
     {"key": "incline", "value": "up", "description": "🄵 Incline"},
@@ -1615,6 +1620,7 @@
     {"key": "oneway", "value": "reversible", "description": "🄵 One Way"},
     {"key": "oneway", "value": "alternating", "description": "🄵 One Way"},
     {"key": "oneway:bicycle", "description": "🄵 One Way (Bicycles)"},
+    {"key": "openfire", "description": "🄵 Open Fires Allowed"},
     {"key": "opening_date", "description": "🄵 Expected Opening Date"},
     {"key": "opening_hours", "description": "🄵 Hours"},
     {"key": "operator", "description": "🄵 Operator"},
@@ -1766,6 +1772,7 @@
     {"key": "service:vehicle:", "description": "🄵 Services"},
     {"key": "shelter_type", "description": "🄵 Type"},
     {"key": "shelter", "description": "🄵 Shelter"},
+    {"key": "shower", "description": "🄵 Showers"},
     {"key": "siren:purpose", "description": "🄵 Purpose"},
     {"key": "siren:type", "value": "pneumatic", "description": "🄵 Type"},
     {"key": "siren:type", "value": "electronic", "description": "🄵 Type"},
@@ -1825,6 +1832,7 @@
     {"key": "target", "description": "🄵 Target"},
     {"key": "tidal", "description": "🄵 Tidal"},
     {"key": "to", "description": "🄵 To"},
+    {"key": "toilets", "description": "🄵 Toilets"},
     {"key": "toilets:disposal", "value": "chemical", "description": "🄵 Disposal"},
     {"key": "toilets:disposal", "value": "bucket", "description": "🄵 Disposal"},
     {"key": "toilets:handwashing", "description": "🄵 Handwashing"},
@@ -2116,6 +2124,7 @@
     {"key": "shop", "value": "tickets", "description": "🄳 ➜ shop=ticket"},
     {"key": "shop", "value": "underwear", "description": "🄳 ➜ shop=clothes + clothes=underwear"},
     {"key": "shop", "value": "winery", "description": "🄳 ➜ craft=winery"},
+    {"key": "showers", "description": "🄳 ➜ shower=*"},
     {"key": "sloped_curb", "value": "0", "description": "🄳 ➜ kerb=flush"},
     {"key": "sloped_curb", "value": "0.00", "description": "🄳 ➜ kerb=flush"},
     {"key": "sloped_curb", "value": "0.01", "description": "🄳 ➜ kerb=lowered + kerb:height=1 cm"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 40023a380..c365292c6 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2762,6 +2762,10 @@
                 "baby_seat": {
                     "label": "Baby Seat"
                 },
+                "backcountry": {
+                    "label": "Backcountry",
+                    "terms": ""
+                },
                 "backrest": {
                     "label": "Backrest"
                 },
@@ -3366,6 +3370,10 @@
                 "grape_variety": {
                     "label": "Grape Varieties"
                 },
+                "group_only": {
+                    "label": "Groups Only",
+                    "terms": ""
+                },
                 "guest_house": {
                     "label": "Type"
                 },
@@ -3455,6 +3463,9 @@
                         "stables": "Yes"
                     }
                 },
+                "hot_water": {
+                    "label": "Hot Water"
+                },
                 "iata": {
                     "label": "IATA Airport Code"
                 },
@@ -3848,6 +3859,10 @@
                     "label": "One Way (Bicycles)",
                     "terms": ""
                 },
+                "openfire": {
+                    "label": "Open Fires Allowed",
+                    "terms": ""
+                },
                 "opening_date": {
                     "label": "Expected Opening Date"
                 },
@@ -4346,6 +4361,10 @@
                 "shop": {
                     "label": "Type"
                 },
+                "shower": {
+                    "label": "Showers",
+                    "terms": ""
+                },
                 "siren/purpose": {
                     "label": "Purpose"
                 },
@@ -4548,6 +4567,10 @@
                 "to": {
                     "label": "To"
                 },
+                "toilets": {
+                    "label": "Toilets",
+                    "terms": ""
+                },
                 "toilets/disposal": {
                     "label": "Disposal",
                     "options": {
@@ -9491,7 +9514,15 @@
                 },
                 "tourism/camp_site": {
                     "name": "Campground",
-                    "terms": "tent,rv"
+                    "terms": "caravans,camp ground,camp pitch,camp site,campers,campground,campsite,mobile homes,recreational vehicles,rv,tenting"
+                },
+                "tourism/camp_site/backcountry": {
+                    "name": "Backcountry Camping Area",
+                    "terms": "alpine camping,backpacking site,backwoods camping,camp ground,camp pitch,camp site,campground,campsite,informal camping,primitive camping"
+                },
+                "tourism/camp_site/group_only": {
+                    "name": "Group Camping Area",
+                    "terms": "camp ground,camp pitch,camp site,campground,campsite,scout camping,youth camping"
                 },
                 "tourism/caravan_site": {
                     "name": "RV Park",