diff --git a/css/25_areas.css b/css/25_areas.css
index d056a60c4..f2bb3184f 100644
--- a/css/25_areas.css
+++ b/css/25_areas.css
@@ -155,7 +155,6 @@ path.fill.tag-amenity-university {
     fill: rgba(196, 189, 25, 0.3);
 }
 path.stroke.tag-landuse-residential,
-path.stroke.tag-landuse.tag-status,
 path.stroke.tag-landuse-construction {
     stroke: rgb(196, 189, 25);
 }
@@ -164,7 +163,6 @@ path.fill.tag-landuse-residential {
     fill: rgba(196, 189, 25, 0.3);
 }
 .preset-icon-fill-area.tag-landuse-residential,
-.preset-icon-fill-area.tag-landuse.tag-status,
 .preset-icon-fill-area.tag-landuse-construction {
     border-color: rgb(196, 189, 25);
     background: rgba(196, 189, 25, 0.3);
diff --git a/data/presets.yaml b/data/presets.yaml
index 45a4bae42..8d99c5949 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -205,6 +205,9 @@ en:
       barrier:
         # barrier=*
         label: Type
+      basin:
+        # basin=*
+        label: Type
       bath/open_air:
         # 'bath:open_air=*'
         label: Open Air
@@ -796,6 +799,9 @@ en:
       intermittent:
         # intermittent=*
         label: Intermittent
+      intermittent_yes:
+        # intermittent=*
+        label: Intermittent
       internet_access:
         # internet_access=*
         label: Internet Access
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 056f65bd3..9fb5363be 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -24,6 +24,7 @@
     "atm": {"key": "atm", "type": "check", "label": "ATM"},
     "backrest": {"key": "backrest", "type": "check", "label": "Backrest"},
     "barrier": {"key": "barrier", "type": "typeCombo", "label": "Type"},
+    "basin": {"key": "basin", "type": "combo", "label": "Type"},
     "bath/open_air": {"key": "bath:open_air", "label": "Open Air", "type": "check"},
     "bath/sand_bath": {"key": "bath:sand_bath", "label": "Sand Bath", "type": "check"},
     "bath/type": {"key": "bath:type", "type": "combo", "label": "Specialty", "strings": {"options": {"onsen": "Japanese Onsen", "foot_bath": "Foot Bath", "hot_spring": "Hot Spring"}}},
@@ -145,6 +146,7 @@
     "industrial": {"key": "industrial", "type": "combo", "label": "Type"},
     "information": {"key": "information", "type": "typeCombo", "label": "Type"},
     "inscription": {"key": "inscription", "type": "textarea", "label": "Inscription"},
+    "intermittent_yes": {"key": "intermittent", "type": "check", "label": "Intermittent", "default": "yes"},
     "intermittent": {"key": "intermittent", "type": "check", "label": "Intermittent"},
     "internet_access": {"key": "internet_access", "type": "combo", "label": "Internet Access", "strings": {"options": {"yes": "Yes", "no": "No", "wlan": "Wifi", "wired": "Wired", "terminal": "Terminal"}}},
     "internet_access/fee": {"key": "internet_access:fee", "type": "check", "label": "Internet Access Fee"},
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8ab2b599f..84fcb743e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -475,7 +475,7 @@
     "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "terms": [], "name": "Farmland", "searchable": false},
     "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
     "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"},
-    "landuse/basin": {"icon": "maki-water", "fields": ["name"], "geometry": ["area"], "tags": {"landuse": "basin"}, "terms": [], "name": "Basin"},
+    "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "terms": [], "name": "Basin"},
     "landuse/brownfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"},
     "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"},
     "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"},
diff --git a/data/presets/presets/landuse/basin.json b/data/presets/presets/landuse/basin.json
index cc3f8b8cf..5fc9bcd7d 100644
--- a/data/presets/presets/landuse/basin.json
+++ b/data/presets/presets/landuse/basin.json
@@ -1,7 +1,9 @@
 {
     "icon": "maki-water",
     "fields": [
-        "name"
+        "name",
+        "basin",
+        "intermittent_yes"
     ],
     "geometry": [
         "area"
diff --git a/data/taginfo.json b/data/taginfo.json
index 952309792..8e25ef493 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -7002,6 +7002,7 @@
     {"key": "artwork_type", "description": "🄵 Type"},
     {"key": "atm", "description": "🄵 ATM"},
     {"key": "backrest", "description": "🄵 Backrest"},
+    {"key": "basin", "description": "🄵 Type"},
     {"key": "bath:open_air", "description": "🄵 Open Air"},
     {"key": "bath:sand_bath", "description": "🄵 Sand Bath"},
     {"key": "bath:type", "value": "onsen", "description": "🄵 Specialty"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a6fa4d734..4ba3ffba4 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1653,6 +1653,9 @@
                 "barrier": {
                     "label": "Type"
                 },
+                "basin": {
+                    "label": "Type"
+                },
                 "bath/open_air": {
                     "label": "Open Air"
                 },
@@ -2172,6 +2175,9 @@
                 "inscription": {
                     "label": "Inscription"
                 },
+                "intermittent_yes": {
+                    "label": "Intermittent"
+                },
                 "intermittent": {
                     "label": "Intermittent"
                 },