diff --git a/data/presets.yaml b/data/presets.yaml
index 7e64c40da..a5c716a72 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1825,7 +1825,7 @@ en:
       aeroway/aerodrome:
         # aeroway=aerodrome
         name: Airport
-        # 'terms: airplane,airport,aerodrome'
+        # 'terms: aerodrome,aeroway,airplane,airport,jet,plane'
         terms: '<translate with synonyms or related terms for ''Airport'', separated by commas>'
       aeroway/apron:
         # aeroway=apron
@@ -3692,7 +3692,7 @@ en:
       landuse/military/airfield:
         # military=airfield
         name: Military Airfield
-        # 'terms: air force,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war'
+        # 'terms: aerodrome,aeroway,air force,airplane,airport,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war'
         terms: '<translate with synonyms or related terms for ''Military Airfield'', separated by commas>'
       landuse/military/barracks:
         # military=barracks
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 31654b69e..5c824b596 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -25,7 +25,7 @@
     "aerialway/pylon": {"geometry": ["point", "vertex"], "fields": ["ref"], "tags": {"aerialway": "pylon"}, "name": "Aerialway Pylon"},
     "aerialway/rope_tow": {"geometry": ["line"], "terms": ["handle tow", "bugel lift"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "rope_tow"}, "name": "Rope Tow Lift"},
     "aerialway/t-bar": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["tbar"], "tags": {"aerialway": "t-bar"}, "name": "T-bar Lift"},
-    "aeroway/aerodrome": {"icon": "maki-airport", "geometry": ["point", "area"], "fields": ["name", "iata", "icao", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "terms": ["airplane", "airport", "aerodrome"], "tags": {"aeroway": "aerodrome"}, "name": "Airport"},
+    "aeroway/aerodrome": {"icon": "maki-airport", "geometry": ["point", "area"], "fields": ["name", "iata", "icao", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "tags": {"aeroway": "aerodrome"}, "matchScore": 0.9, "name": "Airport"},
     "aeroway/apron": {"icon": "maki-airport", "geometry": ["area"], "terms": ["ramp"], "fields": ["ref", "surface"], "tags": {"aeroway": "apron"}, "name": "Apron"},
     "aeroway/gate": {"icon": "maki-airport", "geometry": ["point"], "fields": ["ref_aeroway_gate"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"},
     "aeroway/hangar": {"geometry": ["area"], "fields": ["name", "building_area"], "tags": {"aeroway": "hangar"}, "name": "Hangar"},
@@ -439,7 +439,7 @@
     "landuse/landfill": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "landfill"}, "terms": ["dump"], "name": "Landfill"},
     "landuse/meadow": {"icon": "maki-garden", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "meadow"}, "terms": [], "name": "Meadow"},
     "landuse/military": {"icon": "temaki-military", "fields": ["name"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"},
-    "landuse/military/airfield": {"icon": "maki-airfield", "fields": ["name", "iata", "icao"], "geometry": ["point", "area"], "tags": {"military": "airfield"}, "addTags": {"landuse": "military", "military": "airfield"}, "removeTags": {"landuse": "military", "military": "airfield"}, "terms": ["air force", "army", "base", "bomb", "fight", "force", "guard", "heli*", "jet", "marine", "navy", "plane", "troop", "war"], "name": "Military Airfield"},
+    "landuse/military/airfield": {"icon": "maki-airfield", "fields": ["name", "iata", "icao"], "geometry": ["point", "area"], "tags": {"military": "airfield"}, "addTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "removeTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "reference": {"key": "military", "value": "airfield"}, "terms": ["aerodrome", "aeroway", "air force", "airplane", "airport", "army", "base", "bomb", "fight", "force", "guard", "heli*", "jet", "marine", "navy", "plane", "troop", "war"], "name": "Military Airfield"},
     "landuse/military/barracks": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "barracks"}, "addTags": {"landuse": "military", "military": "barracks"}, "removeTags": {"landuse": "military", "military": "barracks"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Barracks"},
     "landuse/military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "landuse": "military", "military": "bunker"}, "removeTags": {"building": "bunker", "landuse": "military", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"},
     "landuse/military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "addTags": {"landuse": "military", "military": "checkpoint"}, "removeTags": {"landuse": "military", "military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"},
diff --git a/data/presets/presets/aeroway/aerodrome.json b/data/presets/presets/aeroway/aerodrome.json
index 6d98ff8f6..4530677dd 100644
--- a/data/presets/presets/aeroway/aerodrome.json
+++ b/data/presets/presets/aeroway/aerodrome.json
@@ -14,12 +14,16 @@
         "internet_access/ssid"
     ],
     "terms": [
+        "aerodrome",
+        "aeroway",
         "airplane",
         "airport",
-        "aerodrome"
+        "jet",
+        "plane"
     ],
     "tags": {
         "aeroway": "aerodrome"
     },
+    "matchScore": 0.9,
     "name": "Airport"
 }
diff --git a/data/presets/presets/landuse/military/airfield.json b/data/presets/presets/landuse/military/airfield.json
index ebe245114..97b61ff02 100644
--- a/data/presets/presets/landuse/military/airfield.json
+++ b/data/presets/presets/landuse/military/airfield.json
@@ -13,15 +13,25 @@
         "military": "airfield"
     },
     "addTags": {
+        "aeroway": "aerodrome",
         "landuse": "military",
         "military": "airfield"
     },
     "removeTags": {
+        "aeroway": "aerodrome",
         "landuse": "military",
         "military": "airfield"
     },
+    "reference": {
+        "key": "military",
+        "value": "airfield"
+    },
     "terms": [
+        "aerodrome",
+        "aeroway",
         "air force",
+        "airplane",
+        "airport",
         "army",
         "base",
         "bomb",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e4b2ccb4d..8781f6338 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2971,7 +2971,7 @@
                 },
                 "aeroway/aerodrome": {
                     "name": "Airport",
-                    "terms": "airplane,airport,aerodrome"
+                    "terms": "aerodrome,aeroway,airplane,airport,jet,plane"
                 },
                 "aeroway/apron": {
                     "name": "Apron",
@@ -4627,7 +4627,7 @@
                 },
                 "landuse/military/airfield": {
                     "name": "Military Airfield",
-                    "terms": "air force,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war"
+                    "terms": "aerodrome,aeroway,air force,airplane,airport,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war"
                 },
                 "landuse/military/barracks": {
                     "name": "Barracks",