diff --git a/data/presets.yaml b/data/presets.yaml
index c425dd2b2..042c03a58 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1412,6 +1412,9 @@ en:
       place/neighbourhood: 
         name: Neighborhood
         terms: "<translate with synonyms or related terms for 'Neighborhood', separated by commas>"
+      place/suburb: 
+        name: Borough
+        terms: "<translate with synonyms or related terms for 'Borough', separated by commas>"
       place/town: 
         name: Town
         terms: "<translate with synonyms or related terms for 'Town', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7977cda6b..5f22b79ce 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5985,6 +5985,21 @@
         ],
         "name": "Neighborhood"
     },
+    "place/suburb": {
+        "icon": "triangle-stroked",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "place": "suburb"
+        },
+        "terms": [
+            "Boro",
+            "Quarter"
+        ],
+        "name": "Borough"
+    },
     "place/town": {
         "icon": "town",
         "geometry": [
@@ -8116,7 +8131,6 @@
     "waterway/stream": {
         "icon": "waterway-stream",
         "fields": [
-            "layer",
             "tunnel"
         ],
         "geometry": [
diff --git a/data/presets/presets/place/suburb.json b/data/presets/presets/place/suburb.json
new file mode 100644
index 000000000..fe31e3a9a
--- /dev/null
+++ b/data/presets/presets/place/suburb.json
@@ -0,0 +1,15 @@
+{
+    "icon": "triangle-stroked",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "place": "suburb"
+    },
+    "terms": [
+        "Boro",
+        "Quarter"
+    ],
+    "name": "Borough"
+}
diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json
index 35830150f..8c6cb758c 100644
--- a/data/presets/presets/waterway/stream.json
+++ b/data/presets/presets/waterway/stream.json
@@ -1,7 +1,6 @@
 {
     "icon": "waterway-stream",
     "fields": [
-        "layer",
         "tunnel"
     ],
     "geometry": [
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b5a466c9a..ec8eab342 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2318,6 +2318,10 @@
                 "name": "Neighborhood",
                 "terms": "neighbourhood"
             },
+            "place/suburb": {
+                "name": "Borough",
+                "terms": "Boro,Quarter"
+            },
             "place/town": {
                 "name": "Town",
                 "terms": ""