diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3239da821..0e52da0aa 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -683,7 +683,7 @@
     "man_made/tower/communication": {"icon": "temaki-tower", "fields": ["{man_made/tower}", "communication_multi"], "geometry": ["point", "area"], "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": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"},
     "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/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "maxheight"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel"},
+    "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel"},
     "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", "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"},
diff --git a/data/presets/presets/man_made/tunnel.json b/data/presets/presets/man_made/tunnel.json
index 1071ae293..b49b8abad 100644
--- a/data/presets/presets/man_made/tunnel.json
+++ b/data/presets/presets/man_made/tunnel.json
@@ -4,7 +4,9 @@
         "name",
         "tunnel",
         "layer",
-        "maxheight"
+        "width",
+        "length",
+        "height"
     ],
     "geometry": [
         "area"