diff --git a/data/presets.yaml b/data/presets.yaml
index f87b57628..3fae35683 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1043,6 +1043,9 @@ en:
       manhole:
         # manhole=*
         label: Type
+      manufacturer:
+        # manufacturer=*
+        label: Manufacturer
       map_size:
         # map_size=*
         label: Coverage
diff --git a/data/presets/fields.json b/data/presets/fields.json
index dcff1dcc6..606b32855 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -203,6 +203,7 @@
     "lock": {"key": "lock", "type": "check", "label": "Lock"},
     "man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"},
     "manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"},
+    "manufacturer": {"key": "manufacturer", "type": "combo", "snake_case": false, "caseSensitive": true, "label": "Manufacturer"},
     "map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"},
     "map_type": {"key": "map_type", "type": "typeCombo", "label": "Type"},
     "material": {"key": "material", "type": "combo", "label": "Material"},
diff --git a/data/presets/fields/manufacturer.json b/data/presets/fields/manufacturer.json
new file mode 100644
index 000000000..b7c8dcaf4
--- /dev/null
+++ b/data/presets/fields/manufacturer.json
@@ -0,0 +1,7 @@
+{
+    "key": "manufacturer",
+    "type": "combo",
+    "snake_case": false,
+    "caseSensitive": true,
+    "label": "Manufacturer"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 30863628f..22bef7b6c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -633,27 +633,27 @@
     "leisure/water_park": {"icon": "maki-swimming", "fields": ["name", "operator", "address"], "moreFields": ["payment_multi", "brand", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
     "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "terms": ["polyline"], "name": "Line", "matchScore": 0.1},
     "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource", "direction"], "terms": ["cave", "horizontal mine entrance", "tunnel", "underground"], "tags": {"man_made": "adit"}, "name": "Adit"},
-    "man_made/antenna": {"icon": "temaki-antenna", "fields": ["height", "communication_multi"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
-    "man_made/beehive": {"icon": "fas-archive", "geometry": ["point", "area"], "fields": ["ref", "operator", "seasonal", "height", "colour"], "terms": ["apiary", "beekeeper", "farm", "honey", "pollination"], "tags": {"man_made": "beehive"}, "name": "Beehive"},
-    "man_made/breakwater": {"geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
-    "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"},
+    "man_made/antenna": {"icon": "temaki-antenna", "fields": ["communication_multi", "operator", "manufacturer", "height"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
+    "man_made/beehive": {"icon": "fas-archive", "geometry": ["point", "area"], "fields": ["ref", "operator", "seasonal", "height", "colour"], "moreFields": ["manufacturer"], "terms": ["apiary", "beekeeper", "farm", "honey", "pollination"], "tags": {"man_made": "beehive"}, "name": "Beehive"},
+    "man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
+    "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"},
     "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
-    "man_made/chimney": {"icon": "temaki-chimney", "fields": ["material"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
+    "man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
     "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
-    "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
+    "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "manufacturer", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
     "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"},
     "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment"},
-    "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "moreFields": ["material"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
+    "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "moreFields": ["manufacturer", "material"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
     "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
-    "man_made/groyne": {"fields": ["material"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
+    "man_made/groyne": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
     "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["address", "email", "fax", "phone", "seamark/type", "website"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "addTags": {"man_made": "lighthouse", "seamark:type": "light_major"}, "removeTags": {"man_made": "lighthouse", "seamark:type": "*"}, "name": "Lighthouse"},
-    "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["material", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
+    "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["manufacturer", "material", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
     "man_made/mast/communication": {"icon": "maki-communications-tower", "fields": ["{man_made/mast}", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Mast"},
     "man_made/mast/communication/mobile_phone": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:mobile_phone": "yes"}, "reference": {"key": "communication:mobile_phone", "value": "yes"}, "name": "Mobile Phone Mast"},
     "man_made/mast/communication/radio": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "radio mast", "radio tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:radio": "yes"}, "reference": {"key": "communication:radio", "value": "yes"}, "name": "Radio Broadcast Mast"},
     "man_made/mast/communication/television": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "television mast", "television tower", "transmission mast", "transmission tower", "tv mast", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:television": "yes"}, "reference": {"key": "communication:television", "value": "yes"}, "name": "Television Broadcast Mast"},
     "man_made/mineshaft": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource"], "terms": ["cave", "mine shaft", "tunnel", "underground", "vertical mine entrance"], "tags": {"man_made": "mineshaft"}, "name": "Mineshaft"},
-    "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
+    "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator", "manufacturer"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
     "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
     "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
     "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["incline", "{highway/footway}"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "addTags": {"highway": "footway", "man_made": "pier"}, "removeTags": {"highway": "footway", "man_made": "pier"}, "name": "Pier"},
@@ -662,10 +662,10 @@
     "man_made/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "removeTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground Pipeline"},
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
     "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
-    "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
+    "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "manufacturer", "building_area", "height"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
     "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"},
     "man_made/surveillance": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"},
-    "man_made/surveillance/camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
+    "man_made/surveillance/camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "moreFields": ["manufacturer"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
     "man_made/survey_point": {"icon": "maki-monument", "fields": ["ref"], "geometry": ["point", "vertex"], "terms": ["trig point", "triangulation pillar", "trigonometrical station"], "tags": {"man_made": "survey_point"}, "name": "Survey Point"},
     "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"},
     "man_made/tower/bell_tower": {"icon": "fas-bell", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["belfry", "bell gable", "campanile", "church tower", "klockstapel"], "tags": {"man_made": "tower", "tower:type": "bell_tower"}, "reference": {"key": "tower:type", "value": "bell_tower"}, "name": "Bell Tower"},
@@ -673,7 +673,7 @@
     "man_made/tower/minaret": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"},
     "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"},
     "man_made/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
-    "man_made/water_tower": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
+    "man_made/water_tower": {"icon": "maki-water", "fields": ["operator", "height"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
     "man_made/water_well": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "name": "Water Well"},
     "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"},
     "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
@@ -802,18 +802,18 @@
     "point": {"fields": ["name"], "geometry": ["vertex", "point"], "tags": {}, "terms": ["node", "other", "vertex", "vertices"], "name": "Point", "matchScore": 0.1},
     "power/sub_station": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "sub_station"}, "reference": {"key": "power", "value": "substation"}, "name": "Substation", "searchable": false},
     "power/cable/underground": {"fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "removeTags": {"power": "cable", "location": "underground", "layer": "-1"}, "name": "Underground Power Cable"},
-    "power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
-    "power/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["operator", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["photovoltaic module", "PV module", "sunlight"], "tags": {"power": "generator", "generator:method": "photovoltaic"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "removeTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "name": "Solar Panel"},
-    "power/generator/source/nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"},
-    "power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "height", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"},
+    "power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
+    "power/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["operator", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["photovoltaic module", "PV module", "sunlight"], "tags": {"power": "generator", "generator:method": "photovoltaic"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "removeTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "name": "Solar Panel"},
+    "power/generator/source/nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"},
+    "power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/type", "generator/output/electricity", "height", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"},
     "power/line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "line"}, "name": "Power Line"},
     "power/minor_line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "minor_line"}, "name": "Minor Power Line"},
     "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "removeTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"},
-    "power/pole": {"fields": ["ref", "material"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
+    "power/pole": {"fields": ["ref", "material", "operator", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
     "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"},
-    "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "switch"}, "name": "Power Switch"},
-    "power/tower": {"fields": ["design", "ref", "material"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"},
-    "power/transformer": {"icon": "temaki-power", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"},
+    "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"},
+    "power/tower": {"fields": ["design", "ref", "material", "operator", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"},
+    "power/transformer": {"icon": "temaki-power", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"},
     "public_transport/platform_point": {"icon": "maki-rail", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "lit", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2},
     "public_transport/platform": {"icon": "temaki-pedestrian", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "addTags": {"public_transport": "platform", "highway": "footway"}, "removeTags": {"public_transport": "platform", "highway": "footway"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.2},
     "public_transport/platform/aerialway_point": {"icon": "maki-aerialway", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "searchable": false, "name": "Aerialway Stop / Platform"},
diff --git a/data/presets/presets/man_made/antenna.json b/data/presets/presets/man_made/antenna.json
index 78abb4eb1..1e507df9f 100644
--- a/data/presets/presets/man_made/antenna.json
+++ b/data/presets/presets/man_made/antenna.json
@@ -1,8 +1,10 @@
 {
     "icon": "temaki-antenna",
     "fields": [
-        "height",
-        "communication_multi"
+        "communication_multi",
+        "operator",
+        "manufacturer",
+        "height"
     ],
     "geometry": [
         "point"
diff --git a/data/presets/presets/man_made/beehive.json b/data/presets/presets/man_made/beehive.json
index e3b770a2a..668a904b1 100644
--- a/data/presets/presets/man_made/beehive.json
+++ b/data/presets/presets/man_made/beehive.json
@@ -11,6 +11,9 @@
         "height",
         "colour"
     ],
+    "moreFields": [
+        "manufacturer"
+    ],
     "terms": [
         "apiary",
         "beekeeper",
diff --git a/data/presets/presets/man_made/breakwater.json b/data/presets/presets/man_made/breakwater.json
index e95ab46db..1ab7d2c22 100644
--- a/data/presets/presets/man_made/breakwater.json
+++ b/data/presets/presets/man_made/breakwater.json
@@ -1,4 +1,8 @@
 {
+    "fields": [
+        "material",
+        "seamark/type"
+    ],
     "geometry": [
         "line",
         "area"
diff --git a/data/presets/presets/man_made/bridge.json b/data/presets/presets/man_made/bridge.json
index e57128c19..49d38886d 100644
--- a/data/presets/presets/man_made/bridge.json
+++ b/data/presets/presets/man_made/bridge.json
@@ -7,6 +7,7 @@
         "maxweight"
     ],
     "moreFields": [
+        "manufacturer",
         "material",
         "seamark/type"
     ],
diff --git a/data/presets/presets/man_made/chimney.json b/data/presets/presets/man_made/chimney.json
index a4fa25c4b..87b4b9407 100644
--- a/data/presets/presets/man_made/chimney.json
+++ b/data/presets/presets/man_made/chimney.json
@@ -1,7 +1,9 @@
 {
     "icon": "temaki-chimney",
     "fields": [
-        "material"
+        "operator",
+        "material",
+        "height"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/man_made/crane.json b/data/presets/presets/man_made/crane.json
index a7cdda0ac..389a84141 100644
--- a/data/presets/presets/man_made/crane.json
+++ b/data/presets/presets/man_made/crane.json
@@ -2,6 +2,7 @@
     "icon": "temaki-crane",
     "fields": [
         "operator",
+        "manufacturer",
         "height",
         "crane/type"
     ],
diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json
index b7d5586c2..ccb7ecbfa 100644
--- a/data/presets/presets/man_made/flagpole.json
+++ b/data/presets/presets/man_made/flagpole.json
@@ -8,6 +8,7 @@
         "height"
     ],
     "moreFields": [
+        "manufacturer",
         "material"
     ],
     "geometry": [
diff --git a/data/presets/presets/man_made/groyne.json b/data/presets/presets/man_made/groyne.json
index 38094eff3..7fd5511cb 100644
--- a/data/presets/presets/man_made/groyne.json
+++ b/data/presets/presets/man_made/groyne.json
@@ -1,6 +1,7 @@
 {
     "fields": [
-        "material"
+        "material",
+        "seamark/type"
     ],
     "geometry": [
         "line",
diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json
index af4b39e87..619890817 100644
--- a/data/presets/presets/man_made/mast.json
+++ b/data/presets/presets/man_made/mast.json
@@ -6,6 +6,7 @@
         "height"
     ],
     "moreFields": [
+        "manufacturer",
         "material",
         "communication_multi"
     ],
diff --git a/data/presets/presets/man_made/monitoring_station.json b/data/presets/presets/man_made/monitoring_station.json
index d03d60885..e05a69092 100644
--- a/data/presets/presets/man_made/monitoring_station.json
+++ b/data/presets/presets/man_made/monitoring_station.json
@@ -7,7 +7,8 @@
     ],
     "fields": [
         "monitoring_multi",
-        "operator"
+        "operator",
+        "manufacturer"
     ],
     "terms": [
         "weather",
diff --git a/data/presets/presets/man_made/storage_tank.json b/data/presets/presets/man_made/storage_tank.json
index 2890e3f60..23b18b158 100644
--- a/data/presets/presets/man_made/storage_tank.json
+++ b/data/presets/presets/man_made/storage_tank.json
@@ -2,7 +2,10 @@
     "icon": "temaki-storage_tank",
     "fields": [
         "content",
-        "building_area"
+        "operator",
+        "manufacturer",
+        "building_area",
+        "height"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/man_made/surveillance/camera.json b/data/presets/presets/man_made/surveillance/camera.json
index da17e2efb..bc970171c 100644
--- a/data/presets/presets/man_made/surveillance/camera.json
+++ b/data/presets/presets/man_made/surveillance/camera.json
@@ -12,7 +12,10 @@
         "camera/direction",
         "surveillance/zone",
         "contact/webcam"
-     ],
+    ],
+    "moreFields": [
+        "manufacturer"
+    ],
     "terms": [
         "anpr",
         "alpr",
diff --git a/data/presets/presets/man_made/water_tower.json b/data/presets/presets/man_made/water_tower.json
index f4e31f92d..225e3b254 100644
--- a/data/presets/presets/man_made/water_tower.json
+++ b/data/presets/presets/man_made/water_tower.json
@@ -1,7 +1,8 @@
 {
     "icon": "maki-water",
     "fields": [
-        "operator"
+        "operator",
+        "height"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json
index a6458c6c7..eb0027e52 100644
--- a/data/presets/presets/power/generator.json
+++ b/data/presets/presets/power/generator.json
@@ -8,6 +8,9 @@
         "generator/output/electricity",
         "ref"
     ],
+    "moreFields": [
+        "manufacturer"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/power/generator/method/photovoltaic.json b/data/presets/presets/power/generator/method/photovoltaic.json
index 635057fbc..349814c5b 100644
--- a/data/presets/presets/power/generator/method/photovoltaic.json
+++ b/data/presets/presets/power/generator/method/photovoltaic.json
@@ -5,6 +5,9 @@
         "generator/output/electricity",
         "ref"
     ],
+    "moreFields": [
+        "manufacturer"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/power/generator/source/nuclear.json b/data/presets/presets/power/generator/source/nuclear.json
index f4ab63e3a..7fdfaa5c9 100644
--- a/data/presets/presets/power/generator/source/nuclear.json
+++ b/data/presets/presets/power/generator/source/nuclear.json
@@ -8,6 +8,9 @@
         "generator/output/electricity",
         "ref"
     ],
+    "moreFields": [
+        "manufacturer"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/power/generator/source/wind.json b/data/presets/presets/power/generator/source/wind.json
index cb436bece..e76d0c037 100644
--- a/data/presets/presets/power/generator/source/wind.json
+++ b/data/presets/presets/power/generator/source/wind.json
@@ -2,13 +2,14 @@
     "icon": "temaki-wind_turbine",
     "fields": [
         "operator",
-        "generator/source",
-        "generator/method",
         "generator/type",
         "generator/output/electricity",
         "height",
         "ref"
     ],
+    "moreFields": [
+        "manufacturer"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/power/pole.json b/data/presets/presets/power/pole.json
index 2fdc53d77..4c0ef6dce 100644
--- a/data/presets/presets/power/pole.json
+++ b/data/presets/presets/power/pole.json
@@ -1,7 +1,9 @@
 {
     "fields": [
         "ref",
-        "material"
+        "material",
+        "operator",
+        "manufacturer"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/switch.json b/data/presets/presets/power/switch.json
index 550cc497b..fee91ad65 100644
--- a/data/presets/presets/power/switch.json
+++ b/data/presets/presets/power/switch.json
@@ -10,8 +10,7 @@
     ],
     "geometry": [
         "point",
-        "vertex",
-        "area"
+        "vertex"
     ],
     "tags": {
         "power": "switch"
diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json
index 95865dd19..cd74e6904 100644
--- a/data/presets/presets/power/tower.json
+++ b/data/presets/presets/power/tower.json
@@ -2,7 +2,9 @@
     "fields": [
         "design",
         "ref",
-        "material"
+        "material",
+        "operator",
+        "manufacturer"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/transformer.json b/data/presets/presets/power/transformer.json
index 859d074ad..3ce2b06f7 100644
--- a/data/presets/presets/power/transformer.json
+++ b/data/presets/presets/power/transformer.json
@@ -11,6 +11,7 @@
     ],
     "moreFields": [
         "frequency",
+        "manufacturer",
         "voltage/primary",
         "voltage/secondary",
         "voltage/tertiary",
diff --git a/data/taginfo.json b/data/taginfo.json
index 9f997bd72..e1a05a46b 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -785,7 +785,7 @@
     {"key": "power", "value": "plant", "description": "🄿 Power Station Grounds", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/industry-15.svg?sanitize=true"},
     {"key": "power", "value": "pole", "description": "🄿 Power Pole", "object_types": ["node"]},
     {"key": "power", "value": "substation", "description": "🄿 Substation", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
-    {"key": "power", "value": "switch", "description": "🄿 Power Switch", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
+    {"key": "power", "value": "switch", "description": "🄿 Power Switch", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
     {"key": "power", "value": "tower", "description": "🄿 High-Voltage Tower", "object_types": ["node"]},
     {"key": "power", "value": "transformer", "description": "🄿 Transformer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"},
     {"key": "public_transport", "value": "platform", "description": "🄿 Transit Stop / Platform, 🄿 Transit Platform", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/rail-15.svg?sanitize=true"},
@@ -1378,6 +1378,7 @@
     {"key": "location", "value": "roof", "description": "🄵 Location"},
     {"key": "location", "description": "🄵 Location"},
     {"key": "lock", "description": "🄵 Lock"},
+    {"key": "manufacturer", "description": "🄵 Manufacturer"},
     {"key": "map_size", "description": "🄵 Coverage"},
     {"key": "map_type", "description": "🄵 Type"},
     {"key": "material", "description": "🄵 Material"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7f1513e5d..6bfca2a34 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3100,6 +3100,9 @@
                 "manhole": {
                     "label": "Type"
                 },
+                "manufacturer": {
+                    "label": "Manufacturer"
+                },
                 "map_size": {
                     "label": "Coverage"
                 },