diff --git a/data/presets/presets.json b/data/presets/presets.json
index 67df2dd9d..f4c45020e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -42,7 +42,7 @@
     "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": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name", "building_area"], "tags": {"aeroway": "hangar"}, "addTags": {"building": "hangar", "aeroway": "hangar"}, "name": "Hangar"},
-    "aeroway/helipad": {"icon": "maki-heliport", "geometry": ["point", "area"], "fields": ["ref"], "terms": ["helicopter", "helipad", "heliport"], "tags": {"aeroway": "helipad"}, "name": "Helipad"},
+    "aeroway/helipad": {"icon": "maki-heliport", "geometry": ["point", "area"], "fields": ["name", "ref", "operator", "surface", "lit"], "moreFields": ["access_simple", "address", "fee", "opening_hours"], "terms": ["helicopter", "helipad", "heliport"], "tags": {"aeroway": "helipad"}, "name": "Helipad"},
     "aeroway/jet_bridge": {"icon": "temaki-pedestrian", "geometry": ["line"], "fields": ["ref_aeroway_gate", "width", "access_simple", "wheelchair"], "moreFields": ["manufacturer"], "terms": ["aerobridge", "air jetty", "airbridge", "finger", "gangway", "jet way", "jetway", "passenger boarding bridge", "PBB", "portal", "skybridge", "terminal gate connector"], "tags": {"aeroway": "jet_bridge"}, "addTags": {"aeroway": "jet_bridge", "highway": "corridor"}, "matchScore": 1.05, "name": "Jet Bridge"},
     "aeroway/runway": {"icon": "fas-plane-departure", "geometry": ["line", "area"], "terms": ["landing strip"], "fields": ["ref_runway", "surface", "length", "width"], "tags": {"aeroway": "runway"}, "name": "Runway"},
     "aeroway/taxiway": {"icon": "fas-plane", "geometry": ["line"], "fields": ["ref_taxiway", "surface"], "tags": {"aeroway": "taxiway"}, "name": "Taxiway"},
diff --git a/data/presets/presets/aeroway/helipad.json b/data/presets/presets/aeroway/helipad.json
index e279d8a55..9a1d44abe 100644
--- a/data/presets/presets/aeroway/helipad.json
+++ b/data/presets/presets/aeroway/helipad.json
@@ -5,7 +5,17 @@
         "area"
     ],
     "fields": [
-        "ref"
+        "name",
+        "ref",
+        "operator",
+        "surface",
+        "lit"
+    ],
+    "moreFields": [
+        "access_simple",
+        "address",
+        "fee",
+        "opening_hours"
     ],
     "terms": [
         "helicopter",