diff --git a/data/presets/presets.json b/data/presets/presets.json
index 45341e399..21b9a0d43 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -725,7 +725,7 @@
   "leisure/track/cycling": {"icon": "fas-biking", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "cycling"}, "reference": {"key": "sport", "value": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
   "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "reference": {"key": "sport", "value": "horse_racing"}, "terms": ["equestrian race track", "horse race betting", "horseracing", "horsetrack", "horse racetrack"], "name": "Horse Racing Track"},
   "leisure/track/running": {"icon": "maki-pitch", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "reference": {"key": "sport", "value": "running"}, "terms": ["athletics track", "decathlon", "foot race", "long distance running", "marathon", "middle distance running", "racetrack", "running", "sprint", "track", "walking"], "name": "Running Track"},
-  "leisure/water_park": {"icon": "fas-swimmer", "fields": ["name", "operator", "address"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
+  "leisure/water_park": {"icon": "fas-swimmer", "fields": ["{tourism/theme_park}", "sport"], "moreFields": ["{tourism/theme_park}"], "geometry": ["area", "point"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
   "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "terms": ["polyline"], "name": "Line", "matchScore": 0.1},
   "man_made/adit": {"icon": "temaki-adit_profile", "geometry": ["point", "area"], "fields": ["name", "operator", "resource", "direction"], "moreFields": ["gnis/feature_id"], "terms": ["cave", "horizontal mine entrance", "tunnel", "underground"], "tags": {"man_made": "adit"}, "name": "Adit"},
   "man_made/antenna": {"icon": "temaki-antenna", "fields": ["communication_multi", "operator", "manufacturer", "height"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
@@ -1231,7 +1231,7 @@
   "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "museum", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
   "tourism/museum/history": {"icon": "temaki-museum", "geometry": ["point", "area"], "terms": ["artifacts", "dioramas", "exhibits", "exhibitions", "foundation", "hall", "institution"], "tags": {"tourism": "museum", "museum": "history"}, "reference": {"key": "museum", "value": "history"}, "name": "History Museum"},
   "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "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"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
+  "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours", "website"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "wheelchair"], "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"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
   "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "moreFields": ["level"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
   "tourism/wilderness_hut": {"icon": "temaki-cabin", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["alpine hut", "cabin", "backcountry hut", "bothy", "lodge", "lodging", "overnight accommodations", "sleeping shelter", "wilderness hut"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
diff --git a/data/presets/presets/leisure/water_park.json b/data/presets/presets/leisure/water_park.json
index c6e3fd100..8d3a879a4 100644
--- a/data/presets/presets/leisure/water_park.json
+++ b/data/presets/presets/leisure/water_park.json
@@ -1,18 +1,11 @@
 {
     "icon": "fas-swimmer",
     "fields": [
-        "name",
-        "operator",
-        "address"
+        "{tourism/theme_park}",
+        "sport"
     ],
     "moreFields": [
-        "brand",
-        "email",
-        "fax",
-        "gnis/feature_id",
-        "payment_multi",
-        "phone",
-        "website"
+        "{tourism/theme_park}"
     ],
     "geometry": [
         "area",
diff --git a/data/presets/presets/tourism/theme_park.json b/data/presets/presets/tourism/theme_park.json
index a1e98897f..6f8aef956 100644
--- a/data/presets/presets/tourism/theme_park.json
+++ b/data/presets/presets/tourism/theme_park.json
@@ -4,9 +4,11 @@
         "name",
         "operator",
         "address",
-        "opening_hours"
+        "opening_hours",
+        "website"
     ],
     "moreFields": [
+        "brand",
         "email",
         "fax",
         "gnis/feature_id",
@@ -15,7 +17,6 @@
         "internet_access/ssid",
         "payment_multi",
         "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [