diff --git a/data/presets/presets.json b/data/presets/presets.json
index 41294c959..03d1b3011 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -623,7 +623,7 @@
     "leisure/fitness_station/stairs": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "stairs"}, "addTags": {"leisure": "fitness_station", "fitness_station": "stairs", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "steps", "trim trail"], "name": "Exercise Stairs"},
     "leisure/garden": {"icon": "maki-garden", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
     "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"},
-    "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "internet_access"], "moreFields": ["payment_multi", "internet_access/fee", "internet_access/ssid", "smoking", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"},
+    "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"},
     "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"},
     "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
     "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "internet_access", "internet_access/fee", "internet_access/ssid", "seamark/type", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"},
diff --git a/data/presets/presets/leisure/hackerspace.json b/data/presets/presets/leisure/hackerspace.json
index ad81e8787..0d7304dc3 100644
--- a/data/presets/presets/leisure/hackerspace.json
+++ b/data/presets/presets/leisure/hackerspace.json
@@ -6,16 +6,19 @@
         "building_area",
         "opening_hours",
         "website",
-        "internet_access"
+        "fee",
+        "payment_multi_fee",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
     ],
     "moreFields": [
-        "payment_multi",
-        "internet_access/fee",
-        "internet_access/ssid",
-        "smoking",
-        "phone",
+        "air_conditioning",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "smoking",
+        "wheelchair"
     ],
     "geometry": [
         "point",