diff --git a/data/presets/presets.json b/data/presets/presets.json
index a0796b180..10eff1a10 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -607,11 +607,11 @@
     "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/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"},
-    "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "moreFields": ["material"], "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": ["tower/type", "tower/construction", "height", "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", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "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", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "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", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "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/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/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/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "area"], "fields": ["monitoring_multi", "operator"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
     "man_made/observatory": {"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"},
diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json
index cf5db65e5..af4b39e87 100644
--- a/data/presets/presets/man_made/mast.json
+++ b/data/presets/presets/man_made/mast.json
@@ -3,11 +3,11 @@
     "fields": [
         "tower/type",
         "tower/construction",
-        "height",
-        "communication_multi"
+        "height"
     ],
     "moreFields": [
-        "material"
+        "material",
+        "communication_multi"
     ],
     "geometry": [
         "point"
diff --git a/data/presets/presets/man_made/mast/communication.json b/data/presets/presets/man_made/mast/communication.json
index a67d1fcf1..069b38b34 100644
--- a/data/presets/presets/man_made/mast/communication.json
+++ b/data/presets/presets/man_made/mast/communication.json
@@ -1,9 +1,7 @@
 {
     "icon": "maki-communications-tower",
     "fields": [
-        "tower/type",
-        "tower/construction",
-        "height",
+        "{man_made/mast}",
         "communication_multi"
     ],
     "geometry": [
diff --git a/data/presets/presets/man_made/mast/communication/mobile_phone.json b/data/presets/presets/man_made/mast/communication/mobile_phone.json
index 68591951a..a51a5ccbe 100644
--- a/data/presets/presets/man_made/mast/communication/mobile_phone.json
+++ b/data/presets/presets/man_made/mast/communication/mobile_phone.json
@@ -1,11 +1,5 @@
 {
     "icon": "maki-communications-tower",
-    "fields": [
-        "tower/type",
-        "tower/construction",
-        "height",
-        "communication_multi"
-    ],
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/man_made/mast/communication/radio.json b/data/presets/presets/man_made/mast/communication/radio.json
index eaa08ad9d..e1f99b75b 100644
--- a/data/presets/presets/man_made/mast/communication/radio.json
+++ b/data/presets/presets/man_made/mast/communication/radio.json
@@ -1,11 +1,5 @@
 {
     "icon": "maki-communications-tower",
-    "fields": [
-        "tower/type",
-        "tower/construction",
-        "height",
-        "communication_multi"
-    ],
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/man_made/mast/communication/television.json b/data/presets/presets/man_made/mast/communication/television.json
index 4484679a3..defc67e99 100644
--- a/data/presets/presets/man_made/mast/communication/television.json
+++ b/data/presets/presets/man_made/mast/communication/television.json
@@ -1,11 +1,5 @@
 {
     "icon": "maki-communications-tower",
-    "fields": [
-        "tower/type",
-        "tower/construction",
-        "height",
-        "communication_multi"
-    ],
     "geometry": [
         "point"
     ],