diff --git a/data/presets.yaml b/data/presets.yaml
index 3d19229ae..e7f88b9c6 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -7879,4 +7879,5 @@ en:
       waterway/weir:
         # waterway=weir
         name: Weir
+        # 'terms: low-head dam,low-rise dam,wier'
         terms: '<translate with synonyms or related terms for ''Weir'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 92067a1d9..1d4542d28 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -297,8 +297,8 @@
     "barrier/turnstile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"},
     "barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25},
     "boundary/administrative": {"fields": ["name", "admin_level"], "geometry": ["line"], "tags": {"boundary": "administrative"}, "name": "Administrative Boundary", "matchScore": 0.5},
-    "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
-    "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
+    "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support", "height", "layer", "material"], "moreFields": ["colour", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
+    "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support", "{bridge/support}"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
     "building_part": {"icon": "maki-building", "fields": ["levels", "height", "building/material", "roof/colour"], "moreFields": ["layer"], "geometry": ["area"], "tags": {"building:part": "*"}, "matchScore": 0.5, "terms": ["roof", "simple 3D buildings"], "name": "Building Part"},
     "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/levels/underground", "building/material", "layer", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
     "building/bunker": {"geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
@@ -1210,7 +1210,7 @@
     "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
     "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "structure_waterway", "width", "intermittent", "lock"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
     "waterway/canal/lock": {"icon": "iD-waterway-canal", "fields": ["name", "width", "lock"], "moreFields": ["intermittent", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal", "lock": "yes"}, "name": "Canal Lock"},
-    "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name"], "moreFields": ["website"], "tags": {"waterway": "dam"}, "name": "Dam"},
+    "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name", "operator", "height", "material"], "moreFields": ["seamark/type", "website"], "tags": {"waterway": "dam"}, "name": "Dam"},
     "waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["{waterway/drain}"], "moreFields": ["{waterway/drain}"], "geometry": ["line"], "tags": {"waterway": "ditch"}, "name": "Ditch"},
     "waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "ship", "vessel", "marine"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"},
     "waterway/drain": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"},
@@ -1223,7 +1223,7 @@
     "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["covered", "fishing", "salt", "tidal"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"},
     "waterway/water_point": {"icon": "maki-drinking-water", "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "name": "Marine Drinking Water"},
     "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
-    "waterway/weir": {"icon": "maki-dam", "geometry": ["vertex", "line"], "tags": {"waterway": "weir"}, "name": "Weir"},
+    "waterway/weir": {"icon": "maki-dam", "fields": ["name", "operator", "height", "material"], "moreFields": ["seamark/type"], "geometry": ["vertex", "line"], "terms": ["low-head dam", "low-rise dam", "wier"], "tags": {"waterway": "weir"}, "name": "Weir"},
     "amenity/bank/ABANCA": {"name": "ABANCA", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/SomosAbanca/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9598744", "amenity": "bank"}, "addTags": {"amenity": "bank", "brand": "ABANCA", "brand:wikidata": "Q9598744", "brand:wikipedia": "es:Abanca", "name": "ABANCA", "official_name": "ABANCA Corporación Bancaria"}, "countryCodes": ["es"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bank/ABN AMRO": {"name": "ABN AMRO", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/abnamro/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q287471", "amenity": "bank"}, "addTags": {"amenity": "bank", "brand": "ABN AMRO", "brand:wikidata": "Q287471", "brand:wikipedia": "en:ABN AMRO", "name": "ABN AMRO", "official_name": "ABN AMRO Bank N.V."}, "countryCodes": ["nl"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bank/ABSA": {"name": "ABSA", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/AbsaSouthAfrica/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q331688", "amenity": "bank"}, "addTags": {"amenity": "bank", "brand": "ABSA", "brand:wikidata": "Q331688", "brand:wikipedia": "en:ABSA Group Limited", "name": "ABSA"}, "countryCodes": ["za"], "terms": [], "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/bridge/support.json b/data/presets/presets/bridge/support.json
index 8da2485b7..42f57e4da 100644
--- a/data/presets/presets/bridge/support.json
+++ b/data/presets/presets/bridge/support.json
@@ -1,10 +1,13 @@
 {
     "icon": "fas-archway",
     "fields": [
-        "bridge/support"
+        "bridge/support",
+        "height",
+        "layer",
+        "material"
     ],
     "moreFields": [
-        "material",
+        "colour",
         "seamark/type"
     ],
     "geometry": [
diff --git a/data/presets/presets/bridge/support/pier.json b/data/presets/presets/bridge/support/pier.json
index c65a6bbba..55b3bf5f2 100644
--- a/data/presets/presets/bridge/support/pier.json
+++ b/data/presets/presets/bridge/support/pier.json
@@ -1,11 +1,8 @@
 {
     "icon": "fas-archway",
     "fields": [
-        "bridge/support"
-    ],
-    "moreFields": [
-        "material",
-        "seamark/type"
+        "bridge/support",
+        "{bridge/support}"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/waterway/dam.json b/data/presets/presets/waterway/dam.json
index 79dd6e5aa..3c9501bd0 100644
--- a/data/presets/presets/waterway/dam.json
+++ b/data/presets/presets/waterway/dam.json
@@ -7,9 +7,13 @@
         "area"
     ],
     "fields": [
-        "name"
+        "name",
+        "operator",
+        "height",
+        "material"
     ],
     "moreFields": [
+        "seamark/type",
         "website"
     ],
     "tags": {
diff --git a/data/presets/presets/waterway/weir.json b/data/presets/presets/waterway/weir.json
index 96d0820d0..e9c7f0452 100644
--- a/data/presets/presets/waterway/weir.json
+++ b/data/presets/presets/waterway/weir.json
@@ -1,9 +1,23 @@
 {
     "icon": "maki-dam",
+    "fields": [
+        "name",
+        "operator",
+        "height",
+        "material"
+    ],
+    "moreFields": [
+        "seamark/type"    
+    ],
     "geometry": [
         "vertex",
         "line"
     ],
+    "terms": [
+        "low-head dam",
+        "low-rise dam",
+        "wier"
+    ],
     "tags": {
         "waterway": "weir"
     },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index fcf6e61d6..44763ac38 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -9250,7 +9250,7 @@
                 },
                 "waterway/weir": {
                     "name": "Weir",
-                    "terms": ""
+                    "terms": "low-head dam,low-rise dam,wier"
                 }
             }
         },