diff --git a/data/presets.yaml b/data/presets.yaml
index 9b503802e..9720941a1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1043,9 +1043,19 @@ en:
       ref_route:
         # ref=*
         label: Route Number
+      ref_runway:
+        # ref=*
+        label: Runway Number
+        # ref_runway field placeholder
+        placeholder: e.g 01L/23R
       ref_stop_position:
         # ref=*
         label: Stop Number
+      ref_taxiway:
+        # ref=*
+        label: Taxiway Name
+        # ref_taxiway field placeholder
+        placeholder: e.g A5
       relation:
         # type=*
         label: Type
@@ -1457,6 +1467,7 @@ en:
       aerialway/t-bar:
         # aerialway=t-bar
         name: T-bar Lift
+        # 'terms: tbar'
         terms: '<translate with synonyms or related terms for ''T-bar Lift'', separated by commas>'
       aeroway:
         # aeroway=*
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ead82bb63..6d7e0c431 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1393,11 +1393,23 @@
             "type": "text",
             "label": "Route Number"
         },
+        "ref_runway": {
+            "key": "ref",
+            "type": "text",
+            "label": "Runway Number",
+            "placeholder": "e.g 01L/23R"
+        },
         "ref_stop_position": {
             "key": "ref",
             "type": "text",
             "label": "Stop Number"
         },
+        "ref_taxiway": {
+            "key": "ref",
+            "type": "text",
+            "label": "Taxiway Name",
+            "placeholder": "e.g A5"
+        },
         "ref": {
             "key": "ref",
             "type": "text",
diff --git a/data/presets/fields/ref_runway.json b/data/presets/fields/ref_runway.json
new file mode 100644
index 000000000..5b42857f1
--- /dev/null
+++ b/data/presets/fields/ref_runway.json
@@ -0,0 +1,6 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Runway Number",
+    "placeholder": "e.g 01L/23R"
+}
diff --git a/data/presets/fields/ref_taxiway.json b/data/presets/fields/ref_taxiway.json
new file mode 100644
index 000000000..a38d1a84d
--- /dev/null
+++ b/data/presets/fields/ref_taxiway.json
@@ -0,0 +1,6 @@
+{
+    "key": "ref",
+    "type": "text",
+    "label": "Taxiway Name",
+    "placeholder": "e.g A5"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7aeddfcdb..92c966b3c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -345,12 +345,14 @@
             "icon": "aerialway",
             "geometry": [
                 "point",
-                "vertex"
+                "vertex",
+                "area"
             ],
             "fields": [
                 "aerialway/access",
                 "aerialway/summer/access",
-                "elevation"
+                "elevation",
+                "building_area"
             ],
             "tags": {
                 "aerialway": "station"
@@ -366,6 +368,9 @@
                 "aerialway/capacity",
                 "aerialway/duration"
             ],
+            "terms": [
+                "tbar"
+            ],
             "tags": {
                 "aerialway": "t-bar"
             },
@@ -467,7 +472,7 @@
                 "landing strip"
             ],
             "fields": [
-                "ref",
+                "ref_runway",
                 "surface",
                 "length",
                 "width"
@@ -482,7 +487,7 @@
                 "line"
             ],
             "fields": [
-                "ref",
+                "ref_taxiway",
                 "surface"
             ],
             "tags": {
diff --git a/data/presets/presets/aerialway/station.json b/data/presets/presets/aerialway/station.json
index 19e31c2d9..690a357ae 100644
--- a/data/presets/presets/aerialway/station.json
+++ b/data/presets/presets/aerialway/station.json
@@ -2,12 +2,14 @@
     "icon": "aerialway",
     "geometry": [
         "point",
-        "vertex"
+        "vertex",
+        "area"
     ],
     "fields": [
         "aerialway/access",
         "aerialway/summer/access",
-        "elevation"
+        "elevation",
+        "building_area"
     ],
     "tags": {
         "aerialway": "station"
diff --git a/data/presets/presets/aerialway/t-bar.json b/data/presets/presets/aerialway/t-bar.json
index e5a08bf8e..7852b99b6 100644
--- a/data/presets/presets/aerialway/t-bar.json
+++ b/data/presets/presets/aerialway/t-bar.json
@@ -7,6 +7,9 @@
         "aerialway/capacity",
         "aerialway/duration"
     ],
+    "terms": [
+        "tbar"
+    ],
     "tags": {
         "aerialway": "t-bar"
     },
diff --git a/data/presets/presets/aeroway/runway.json b/data/presets/presets/aeroway/runway.json
index 42f9dec3d..34885e219 100644
--- a/data/presets/presets/aeroway/runway.json
+++ b/data/presets/presets/aeroway/runway.json
@@ -7,7 +7,7 @@
         "landing strip"
     ],
     "fields": [
-        "ref",
+        "ref_runway",
         "surface",
         "length",
         "width"
diff --git a/data/presets/presets/aeroway/taxiway.json b/data/presets/presets/aeroway/taxiway.json
index 2f389be5d..3882deaba 100644
--- a/data/presets/presets/aeroway/taxiway.json
+++ b/data/presets/presets/aeroway/taxiway.json
@@ -3,7 +3,7 @@
         "line"
     ],
     "fields": [
-        "ref",
+        "ref_taxiway",
         "surface"
     ],
     "tags": {
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 39d7c52c7..29a267e79 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1949,9 +1949,17 @@
                 "ref_route": {
                     "label": "Route Number"
                 },
+                "ref_runway": {
+                    "label": "Runway Number",
+                    "placeholder": "e.g 01L/23R"
+                },
                 "ref_stop_position": {
                     "label": "Stop Number"
                 },
+                "ref_taxiway": {
+                    "label": "Taxiway Name",
+                    "placeholder": "e.g A5"
+                },
                 "ref": {
                     "label": "Reference Code"
                 },
@@ -2342,7 +2350,7 @@
                 },
                 "aerialway/t-bar": {
                     "name": "T-bar Lift",
-                    "terms": ""
+                    "terms": "tbar"
                 },
                 "aeroway/aerodrome": {
                     "name": "Airport",