diff --git a/data/presets.yaml b/data/presets.yaml
index db0ec20fb..dc8ebd8a4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2239,10 +2239,14 @@ en:
         # golf=hole
         name: Golf Hole
         terms: '<translate with synonyms or related terms for ''Golf Hole'', separated by commas>'
-      golf/lateral_water_hazard:
+      golf/lateral_water_hazard_area:
         # 'golf=lateral_water_hazard, natural=water'
         name: Lateral Water Hazard
         terms: '<translate with synonyms or related terms for ''Lateral Water Hazard'', separated by commas>'
+      golf/lateral_water_hazard_line:
+        # golf=lateral_water_hazard
+        name: Lateral Water Hazard
+        terms: '<translate with synonyms or related terms for ''Lateral Water Hazard'', separated by commas>'
       golf/rough:
         # 'golf=rough, landuse=grass'
         name: Rough
@@ -2252,10 +2256,14 @@ en:
         name: Tee Box
         # 'terms: teeing ground'
         terms: '<translate with synonyms or related terms for ''Tee Box'', separated by commas>'
-      golf/water_hazard:
+      golf/water_hazard_area:
         # 'golf=water_hazard, natural=water'
         name: Water Hazard
         terms: '<translate with synonyms or related terms for ''Water Hazard'', separated by commas>'
+      golf/water_hazard_line:
+        # golf=water_hazard
+        name: Water Hazard
+        terms: '<translate with synonyms or related terms for ''Water Hazard'', separated by commas>'
       healthcare/blood_donation:
         # healthcare=blood_donation
         name: Blood Donor Center
diff --git a/data/presets/categories.json b/data/presets/categories.json
index db4ead5ca..bb90f4f85 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -31,11 +31,11 @@
         "members": [
             "golf/fairway",
             "golf/green",
-            "golf/lateral_water_hazard",
+            "golf/lateral_water_hazard_area",
             "golf/rough",
             "golf/bunker",
             "golf/tee",
-            "golf/water_hazard"
+            "golf/water_hazard_area"
         ]
     },
     "category-landuse": {
diff --git a/data/presets/categories/golf.json b/data/presets/categories/golf.json
index 1077ac42b..3634b82e7 100644
--- a/data/presets/categories/golf.json
+++ b/data/presets/categories/golf.json
@@ -5,10 +5,10 @@
     "members": [
         "golf/fairway",
         "golf/green",
-        "golf/lateral_water_hazard",
+        "golf/lateral_water_hazard_area",
         "golf/rough",
         "golf/bunker",
         "golf/tee",
-        "golf/water_hazard"
+        "golf/water_hazard_area"
     ]
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index d145edad6..5326a4738 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4422,10 +4422,9 @@
         },
         "name": "Golf Hole"
     },
-    "golf/lateral_water_hazard": {
+    "golf/lateral_water_hazard_area": {
         "icon": "golf",
         "geometry": [
-            "line",
             "area"
         ],
         "tags": {
@@ -4434,6 +4433,16 @@
         },
         "name": "Lateral Water Hazard"
     },
+    "golf/lateral_water_hazard_line": {
+        "icon": "golf",
+        "geometry": [
+            "line"
+        ],
+        "tags": {
+            "golf": "lateral_water_hazard"
+        },
+        "name": "Lateral Water Hazard"
+    },
     "golf/rough": {
         "icon": "golf",
         "geometry": [
@@ -4459,10 +4468,9 @@
         ],
         "name": "Tee Box"
     },
-    "golf/water_hazard": {
+    "golf/water_hazard_area": {
         "icon": "golf",
         "geometry": [
-            "line",
             "area"
         ],
         "tags": {
@@ -4471,6 +4479,16 @@
         },
         "name": "Water Hazard"
     },
+    "golf/water_hazard_line": {
+        "icon": "golf",
+        "geometry": [
+            "line"
+        ],
+        "tags": {
+            "golf": "water_hazard"
+        },
+        "name": "Water Hazard"
+    },
     "healthcare/blood_donation": {
         "icon": "hospital",
         "fields": [
diff --git a/data/presets/presets/golf/lateral_water_hazard.json b/data/presets/presets/golf/lateral_water_hazard_area.json
similarity index 91%
rename from data/presets/presets/golf/lateral_water_hazard.json
rename to data/presets/presets/golf/lateral_water_hazard_area.json
index 82a4dd0ea..c075f3b08 100644
--- a/data/presets/presets/golf/lateral_water_hazard.json
+++ b/data/presets/presets/golf/lateral_water_hazard_area.json
@@ -1,7 +1,6 @@
 {
     "icon": "golf",
     "geometry": [
-        "line",
         "area"
     ],
     "tags": {
@@ -9,4 +8,4 @@
         "natural": "water"
     },
     "name": "Lateral Water Hazard"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/golf/lateral_water_hazard_line.json b/data/presets/presets/golf/lateral_water_hazard_line.json
new file mode 100644
index 000000000..cced33545
--- /dev/null
+++ b/data/presets/presets/golf/lateral_water_hazard_line.json
@@ -0,0 +1,10 @@
+{
+    "icon": "golf",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "golf": "lateral_water_hazard"
+    },
+    "name": "Lateral Water Hazard"
+}
diff --git a/data/presets/presets/golf/water_hazard.json b/data/presets/presets/golf/water_hazard_area.json
similarity index 90%
rename from data/presets/presets/golf/water_hazard.json
rename to data/presets/presets/golf/water_hazard_area.json
index fb7645a7b..7c217f73f 100644
--- a/data/presets/presets/golf/water_hazard.json
+++ b/data/presets/presets/golf/water_hazard_area.json
@@ -1,7 +1,6 @@
 {
     "icon": "golf",
     "geometry": [
-        "line",
         "area"
     ],
     "tags": {
@@ -9,4 +8,4 @@
         "natural": "water"
     },
     "name": "Water Hazard"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/golf/water_hazard_line.json b/data/presets/presets/golf/water_hazard_line.json
new file mode 100644
index 000000000..57afafd04
--- /dev/null
+++ b/data/presets/presets/golf/water_hazard_line.json
@@ -0,0 +1,10 @@
+{
+    "icon": "golf",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "golf": "water_hazard"
+    },
+    "name": "Water Hazard"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 8ad9e5c8b..53eab340c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -990,6 +990,10 @@
             "key": "natural",
             "value": "water"
         },
+        {
+            "key": "golf",
+            "value": "lateral_water_hazard"
+        },
         {
             "key": "landuse",
             "value": "grass"
@@ -1002,6 +1006,10 @@
             "key": "natural",
             "value": "water"
         },
+        {
+            "key": "golf",
+            "value": "water_hazard"
+        },
         {
             "key": "healthcare",
             "value": "blood_donation"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index d59fa3978..8c3b91a6a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2595,7 +2595,11 @@
                 "name": "Golf Hole",
                 "terms": ""
             },
-            "golf/lateral_water_hazard": {
+            "golf/lateral_water_hazard_area": {
+                "name": "Lateral Water Hazard",
+                "terms": ""
+            },
+            "golf/lateral_water_hazard_line": {
                 "name": "Lateral Water Hazard",
                 "terms": ""
             },
@@ -2607,7 +2611,11 @@
                 "name": "Tee Box",
                 "terms": "teeing ground"
             },
-            "golf/water_hazard": {
+            "golf/water_hazard_area": {
+                "name": "Water Hazard",
+                "terms": ""
+            },
+            "golf/water_hazard_line": {
                 "name": "Water Hazard",
                 "terms": ""
             },