diff --git a/data/fields/capacity/caravans.json b/data/fields/capacity/caravans.json
index 5aa88e42..d2d2920e 100644
--- a/data/fields/capacity/caravans.json
+++ b/data/fields/capacity/caravans.json
@@ -2,6 +2,10 @@
     "key": "capacity:caravans",
     "type": "number",
     "minValue": 0,
-    "label": "Capacity (Caravans)",
-    "placeholder": "10, 20, 50..."
+    "label": "Capacity (Campervan / Camping Trailer)",
+    "placeholder": "10, 20, 50...",
+    "prerequisiteTag": {
+        "key": "caravans",
+        "valueNot": "no"
+    }
 }
diff --git a/data/fields/caravans.json b/data/fields/caravans.json
new file mode 100644
index 00000000..40cc30e5
--- /dev/null
+++ b/data/fields/caravans.json
@@ -0,0 +1,11 @@
+{
+    "key": "caravans",
+    "type": "check",
+    "label": "Campervan / Camping Trailer",
+    "terms": [
+        "Camper",
+        "Camper Trailer",
+        "Caravan",
+        "Tourer"
+    ]
+}
diff --git a/data/fields/nudism.json b/data/fields/nudism.json
new file mode 100644
index 00000000..f77db02d
--- /dev/null
+++ b/data/fields/nudism.json
@@ -0,0 +1,23 @@
+{
+    "key": "nudism",
+    "type": "combo",
+    "label": "Nudism",
+    "strings": {
+        "options": {
+            "customary": "Customary",
+            "designated": "Designated",
+            "no": "Prohibited",
+            "obligatory": "Obligatory",
+            "permissive": "Permissive",
+            "yes": "Allowed"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": false,
+    "terms": [
+        "naturism",
+        "naturist",
+        "nude recreation",
+        "nudist"
+    ]
+}
diff --git a/data/fields/picnic_table.json b/data/fields/picnic_table.json
new file mode 100644
index 00000000..375c886a
--- /dev/null
+++ b/data/fields/picnic_table.json
@@ -0,0 +1,9 @@
+{
+    "key": "picnic_table",
+    "type": "check",
+    "label": "Picnic Table",
+    "terms": [
+        "outdoor table",
+        "bench"
+    ]
+}
diff --git a/data/fields/static_caravans.json b/data/fields/static_caravans.json
new file mode 100644
index 00000000..bc2d42e4
--- /dev/null
+++ b/data/fields/static_caravans.json
@@ -0,0 +1,11 @@
+{
+    "key": "static_caravans",
+    "type": "check",
+    "label": "Mobile Homes",
+    "terms": [
+        "House Trailers",
+        "Park Home",
+        "Static Caravans",
+        "Trailer home"
+    ]
+}
diff --git a/data/fields/tents.json b/data/fields/tents.json
new file mode 100644
index 00000000..90a3053c
--- /dev/null
+++ b/data/fields/tents.json
@@ -0,0 +1,5 @@
+{
+    "key": "tents",
+    "type": "check",
+    "label": "Tents"
+}
diff --git a/data/presets/building/static_caravan.json b/data/presets/building/static_caravan.json
index a78e9e38..19a570f7 100644
--- a/data/presets/building/static_caravan.json
+++ b/data/presets/building/static_caravan.json
@@ -9,12 +9,12 @@
     "terms": [
         "house trailer",
         "manufactured home",
-        "mobile home",
         "prefabricated home",
         "residential caravan",
         "static caravan",
+        "static mobile home",
         "trailer home"
     ],
     "matchScore": 0.5,
-    "name": "Static Mobile Home"
+    "name": "Mobile Home"
 }
diff --git a/data/presets/tourism/camp_site.json b/data/presets/tourism/camp_site.json
index f5377149..316d5a5e 100644
--- a/data/presets/tourism/camp_site.json
+++ b/data/presets/tourism/camp_site.json
@@ -5,9 +5,12 @@
         "operator",
         "address",
         "access_simple",
-        "capacity/caravans",
         "capacity/persons",
+        "tents",
         "capacity/tents",
+        "caravans",
+        "capacity/caravans",
+        "static_caravans",
         "fee",
         "payment_multi_fee",
         "charge_fee"
@@ -23,10 +26,12 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "nudism",
         "openfire",
         "opening_hours",
         "opening_hours/covid19",
         "phone",
+        "picnic_table",
         "power_supply",
         "ref/vatin",
         "reservation",
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 827dcc49..6e81e779 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -664,7 +664,7 @@ en:
         terms: '[translate with synonyms or related terms for ''Capacity'', separated by commas]'
       capacity/caravans:
         # capacity:caravans=*
-        label: Capacity (Caravans)
+        label: Capacity (Campervan / Camping Trailer)
         # capacity/caravans field placeholder
         placeholder: 10, 20, 50...
       capacity/disabled_parking:
@@ -692,6 +692,9 @@ en:
         label: Capacity (Cubic Meters)
         # capacity_volume field placeholder
         placeholder: 50, 100, 200...
+      caravans:
+        # caravans=*
+        label: Campervan / Camping Trailer
       cash_in:
         # cash_in=*
         label: Deposits
@@ -2744,6 +2747,24 @@ en:
         label: Note
         # 'terms: comment'
         terms: '[translate with synonyms or related terms for ''Note'', separated by commas]'
+      nudism:
+        # nudism=*
+        label: Nudism
+        options:
+          # nudism=customary
+          customary: Customary
+          # nudism=designated
+          designated: Designated
+          # nudism=no
+          'no': Prohibited
+          # nudism=obligatory
+          obligatory: Obligatory
+          # nudism=permissive
+          permissive: Permissive
+          # nudism=yes
+          'yes': Allowed
+        # 'terms: naturism,naturist,nude recreation,nudist'
+        terms: '[translate with synonyms or related terms for ''Nudism'', separated by commas]'
       office:
         # office=*
         label: Type
@@ -3017,6 +3038,11 @@ en:
         placeholder: +31 42 123 4567
         # 'terms: phone number'
         terms: '[translate with synonyms or related terms for ''Telephone'', separated by commas]'
+      picnic_table:
+        # picnic_table=*
+        label: Picnic Table
+        # 'terms: outdoor table,bench'
+        terms: '[translate with synonyms or related terms for ''Picnic Table'', separated by commas]'
       pipeline:
         # pipeline=*
         label: Type
@@ -4032,6 +4058,9 @@ en:
         placeholder: YYYY-MM-DD
         # 'terms: inception'
         terms: '[translate with synonyms or related terms for ''Start Date'', separated by commas]'
+      static_caravans:
+        # static_caravans=*
+        label: Mobile Homes
       step_count:
         # step_count=*
         label: Number of Steps
@@ -4331,6 +4360,9 @@ en:
       telecom/medium:
         # telecom:medium=*
         label: Medium
+      tents:
+        # tents=*
+        label: Tents
       tidal:
         # tidal=*
         label: Tidal
@@ -6856,9 +6888,9 @@ en:
         terms: <translate with synonyms or related terms for 'Stadium Building', separated by commas>
       building/static_caravan:
         # building=static_caravan | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Static Mobile Home
-        # 'terms: house trailer,manufactured home,mobile home,prefabricated home,residential caravan,static caravan,trailer home'
-        terms: <translate with synonyms or related terms for 'Static Mobile Home', separated by commas>
+        name: Mobile Home
+        # 'terms: house trailer,manufactured home,prefabricated home,residential caravan,static caravan,static mobile home,trailer home'
+        terms: <translate with synonyms or related terms for 'Mobile Home', separated by commas>
       building/sty:
         # building=sty | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Pigsty