diff --git a/data/presets/natural/water/river.json b/data/presets/natural/water/river.json
index 10f24291..a8d218ed 100644
--- a/data/presets/natural/water/river.json
+++ b/data/presets/natural/water/river.json
@@ -1,9 +1,13 @@
 {
     "icon": "iD-waterway-river",
     "fields": [
-        "{natural/water}",
+        "water",
+        "intermittent",
         "tidal"
     ],
+    "moreFields": [
+        "name"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/natural/water/stream.json b/data/presets/natural/water/stream.json
index 9a9e8b0e..1e3e336a 100644
--- a/data/presets/natural/water/stream.json
+++ b/data/presets/natural/water/stream.json
@@ -1,7 +1,11 @@
 {
     "icon": "iD-waterway-stream",
     "fields": [
-        "{natural/water}"
+        "water",
+        "intermittent"
+    ],
+    "moreFields": [
+        "name"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/waterway/_riverbank.json b/data/presets/waterway/_riverbank.json
index 2d802203..c7ef5cee 100644
--- a/data/presets/waterway/_riverbank.json
+++ b/data/presets/waterway/_riverbank.json
@@ -3,6 +3,10 @@
     "geometry": [
         "area"
     ],
+    "fields": [],
+    "moreFields": [
+        "name"
+    ],
     "tags": {
         "waterway": "riverbank"
     },