diff --git a/data/deprecated.json b/data/deprecated.json
index 8a13ee4fc..263fc0f44 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -986,6 +986,10 @@
     "old": {"leisure": "recreation_ground"},
     "replace": {"landuse": "recreation_ground"}
   },
+  {
+    "old": {"leisure": "swimming_pool", "swimming_pool": "hot_tub"},
+    "replace": {"leisure": "hot_tub"}
+  },
   {
     "old": {"leisure": "table_tennis_table"},
     "replace": {"leisure": "pitch", "sport": "table_tennis"}
diff --git a/data/fields/swimming_pool.json b/data/fields/swimming_pool.json
index f7eff1c78..c9935c7f3 100644
--- a/data/fields/swimming_pool.json
+++ b/data/fields/swimming_pool.json
@@ -1,5 +1,19 @@
 {
     "key": "swimming_pool",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "swimming": "Lap Pool",
+            "plunge": "Diving",
+            "wading": "Wading / Leisure",
+            "spa": "Spa",
+            "wave_pool": "Wave Pool",
+            "lazy_river": "Lazy River",
+            "personal": "Personal / Backyard",
+            "kids": "Kids Pool"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": true
 }
diff --git a/data/presets/leisure/hot_tub.json b/data/presets/leisure/hot_tub.json
new file mode 100644
index 000000000..b7b38f2a5
--- /dev/null
+++ b/data/presets/leisure/hot_tub.json
@@ -0,0 +1,27 @@
+{
+    "icon": "fas-hot-tub-person",
+    "fields": [
+        "access_simple",
+        "location_pool"
+    ],
+    "moreFields": [
+        "level",
+        "gender",
+        "lit",
+        "nudism",
+        "opening_hours",
+        "operator"
+    ],
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "terms": [
+        "jacuzzi",
+        "spa"
+    ],
+    "tags": {
+        "leisure": "hot_tub"
+    },
+    "name": "Hot Tub"
+}