diff --git a/data/presets.yaml b/data/presets.yaml
index 99a096638..2e950200e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -175,6 +175,9 @@ en:
       agrarian:
         # agrarian=*
         label: Products
+      air_conditioning:
+        # air_conditioning=*
+        label: Air Conditioning
       amenity:
         # amenity=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ba126d946..ab7d1aaa1 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -14,6 +14,7 @@
     "aerialway/summer/access": {"key": "aerialway:summer:access", "type": "combo", "label": "Access (summer)", "strings": {"options": {"entry": "Entry", "exit": "Exit", "both": "Both"}}},
     "aeroway": {"key": "aeroway", "type": "typeCombo", "label": "Type"},
     "agrarian": {"key": "agrarian", "type": "semiCombo", "label": "Products"},
+    "air_conditioning": {"key": "air_conditioning", "type": "check", "label": "Air Conditioning"},
     "amenity": {"key": "amenity", "type": "typeCombo", "label": "Type"},
     "animal_boarding": {"key": "animal_boarding", "type": "semiCombo", "label": "For Animals"},
     "animal_breeding": {"key": "animal_breeding", "type": "semiCombo", "label": "For Animals"},
diff --git a/data/presets/fields/air_conditioning.json b/data/presets/fields/air_conditioning.json
new file mode 100644
index 000000000..79408c722
--- /dev/null
+++ b/data/presets/fields/air_conditioning.json
@@ -0,0 +1,5 @@
+{
+    "key": "air_conditioning",
+    "type": "check",
+    "label": "Air Conditioning"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3b5f398ce..c54260f34 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -55,8 +55,8 @@
     "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
     "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"},
     "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["name", "brand", "lit", "opening_hours", "wheelchair", "covered"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
-    "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["opening_hours", "currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
-    "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "brewery"], "moreFields": ["email", "fax", "microbrewery", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
+    "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "opening_hours", "currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
+    "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "microbrewery", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
     "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgbtq bar", "lgbt bar", "lgb bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"},
     "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "moreFields": ["lit"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
     "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "inscription", "lit"], "geometry": ["point", "vertex", "line"], "terms": ["seat"], "tags": {"amenity": "bench"}, "name": "Bench"},
@@ -66,22 +66,22 @@
     "amenity/biergarten": {"icon": "maki-beer", "fields": ["name", "address", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
     "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "fee", "payment_multi"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
     "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
-    "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating"], "moreFields": ["diet_multi", "takeaway", "delivery", "capacity", "opening_hours", "smoking", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "bar"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+    "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating"], "moreFields": ["air_conditioning", "diet_multi", "takeaway", "delivery", "capacity", "opening_hours", "smoking", "payment_multi", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "bar"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
     "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "address", "opening_hours", "lit"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
     "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
     "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["lit", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
     "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
-    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
+    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
     "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "fee", "payment_multi"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
     "amenity/childcare": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
-    "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
-    "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "removeTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
+    "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
+    "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "removeTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
     "amenity/clinic/abortion": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "abortion"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Abortion Clinic"},
     "amenity/clinic/fertility": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["egg", "fertility", "reproductive", "sperm", "ovulation"], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "fertility"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Fertility Clinic"},
     "amenity/clock": {"icon": "temaki-clock", "fields": ["name", "support", "display", "visibility", "date", "faces"], "moreFields": ["lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "clock"}, "name": "Clock"},
     "amenity/clock/sundial": {"icon": "temaki-clock", "fields": ["name", "support", "visibility", "inscription"], "moreFields": [], "geometry": ["point", "vertex"], "terms": ["gnomon", "shadow"], "tags": {"amenity": "clock", "display": "sundial"}, "reference": {"key": "display", "value": "sundial"}, "name": "Sundial"},
     "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "address", "website", "internet_access"], "moreFields": ["religion", "denomination", "internet_access/fee", "internet_access/ssid", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
-    "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
+    "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
     "amenity/community_centre/lgbtq": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["lgbtq event", "lgbtq hall", "lgbt event", "lgbt hall", "lgb event", "lgb hall"], "tags": {"amenity": "community_centre", "lgbtq": "primary"}, "name": "LGBTQ+ Community Center"},
     "amenity/compressed_air": {"icon": "maki-car", "fields": ["operator", "fee", "payment_multi", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
     "amenity/courthouse": {"icon": "temaki-courthouse", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
@@ -93,7 +93,7 @@
     "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "wheelchair"], "moreFields": ["lit", "covered"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
     "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
     "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "name": "Embassy"},
-    "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["opening_hours", "diet_multi", "takeaway", "delivery", "smoking", "capacity", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
+    "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "opening_hours", "diet_multi", "takeaway", "delivery", "smoking", "capacity", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
     "amenity/fast_food/burger": {"icon": "maki-fast-food", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Fast Food"},
     "amenity/fast_food/chicken": {"icon": "fas-drumstick-bite", "geometry": ["point", "area"], "terms": ["breakfast", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "name": "Chicken Fast Food"},
     "amenity/fast_food/fish_and_chips": {"icon": "fas-fish", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "french fries"], "tags": {"amenity": "fast_food", "cuisine": "fish_and_chips"}, "reference": {"key": "cuisine", "value": "fish_and_chips"}, "name": "Fish & Chips Fast Food"},
@@ -110,17 +110,17 @@
     "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "emergency"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "removeTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
     "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
     "amenity/ice_cream": {"icon": "maki-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "drive_through", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
-    "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["opening_hours", "smoking", "outdoor_seating", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
+    "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "opening_hours", "smoking", "outdoor_seating", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
     "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
-    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "ref/isil", "internet_access"], "moreFields": ["access_simple", "opening_hours", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "payment_multi"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
+    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "building_area", "address", "ref/isil", "internet_access"], "moreFields": ["access_simple", "air_conditioning", "opening_hours", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "payment_multi"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
     "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
     "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
     "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
     "amenity/money_transfer": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["money order", "check", "bill", "currency", "finance", "wire transfer", "cable", "person to person", "cash to cash", "exchange"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"},
     "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"},
     "amenity/music_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
-    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
+    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
     "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["access_simple", "ref"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
     "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
@@ -130,7 +130,7 @@
     "amenity/payment_terminal": {"icon": "maki-bank", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "wheelchair"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"},
     "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
     "amenity/photo_booth": {"icon": "maki-attraction", "fields": ["name", "operator", "payment_multi", "wheelchair"], "geometry": ["point", "area"], "terms": ["photobooth", "photo", "booth", "kiosk", "camera"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"},
-    "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["opening_hours", "internet_access", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
+    "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "opening_hours", "internet_access", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
     "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
     "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
     "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["kovil", "devasthana", "mandir", "kshetram", "alayam", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"},
@@ -139,12 +139,12 @@
     "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"},
     "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"},
     "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
-    "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
+    "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
     "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
     "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"},
     "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
     "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
-    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
+    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
     "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgbtq pub", "lgbt pub", "lgb pub"], "name": "LGBTQ+ Pub"},
     "amenity/pub/microbrewery": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "microbrewery": "yes"}, "reference": {"key": "microbrewery"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze", "craft brewery", "microbrewery", "small batch brewery"], "name": "Brewpub"},
     "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
@@ -152,7 +152,7 @@
     "amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["visitor center", "visitor centre", "permit center", "permit centre", "backcountry office", "warden office", "warden center"], "tags": {"amenity": "ranger_station"}, "name": "Ranger Station"},
     "amenity/recycling_centre": {"icon": "maki-recycling", "fields": ["name", "operator", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["bottle", "can", "dump", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "centre"}, "reference": {"key": "recycling_type", "value": "*"}, "name": "Recycling Center"},
     "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
-    "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "phone", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
+    "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["air_conditioning", "bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "phone", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
     "amenity/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"},
     "amenity/restaurant/asian": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "asian"}, "reference": {"key": "cuisine", "value": "asian"}, "name": "Asian Restaurant"},
     "amenity/restaurant/chinese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "chinese"}, "reference": {"key": "cuisine", "value": "chinese"}, "name": "Chinese Restaurant"},
@@ -188,7 +188,7 @@
     "amenity/studio": {"icon": "maki-karaoke", "fields": ["name", "studio", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
     "amenity/taxi": {"icon": "fas-taxi", "fields": ["name", "operator", "capacity"], "moreFields": ["address", "opening_hours", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"},
     "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi", "booth"], "moreFields": ["covered", "indoor", "lit", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"},
-    "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
+    "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
     "amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["open air", "outdoor", "greek", "ampi"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"},
     "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "building_area", "access_simple", "gender", "diaper", "wheelchair"], "moreFields": ["fee", "opening_hours", "operator", "payment_multi"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
     "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
@@ -317,7 +317,7 @@
     "camp_site/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"camp_site": "camp_pitch"}, "name": "Camp Pitch"},
     "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
     "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
-    "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["product", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
+    "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "product", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
     "craft/jeweler": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "jeweler"}, "reference": {"key": "shop", "value": "jewelry"}, "name": "Jeweler", "searchable": false, "replacement": "shop/jewelry"},
     "craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false},
     "craft/optician": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "optician"}, "reference": {"key": "shop", "value": "optician"}, "name": "Optician", "searchable": false, "replacement": "shop/optician"},
@@ -539,12 +539,12 @@
     "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
     "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
     "leisure/adult_gaming_centre": {"icon": "temaki-casino", "fields": ["{amenity/casino}"], "moreFields": ["{amenity/casino}"], "geometry": ["point", "area"], "terms": ["gambling", "slot machine"], "tags": {"leisure": "adult_gaming_centre"}, "name": "Adult Gaming Center"},
-    "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
+    "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
     "leisure/bandstand": {"icon": "maki-music", "fields": ["name", "building_area", "operator"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"},
     "leisure/beach_resort": {"icon": "maki-beach", "fields": ["name", "address", "fee"], "moreFields": ["opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
     "leisure/bird_hide": {"icon": "temaki-binoculars", "fields": ["name", "building_area", "address", "opening_hours"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bird_hide"}, "terms": ["machan", "ornithology"], "name": "Bird Hide"},
     "leisure/bleachers": {"geometry": ["point", "area"], "tags": {"leisure": "bleachers"}, "terms": ["crowd", "bench", "sports", "stand", "stands", "seat", "seating"], "name": "Bleachers"},
-    "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
+    "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "opening_hours", "payment_multi", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
     "leisure/common": {"icon": "temaki-pedestrian", "fields": ["name"], "moreFields": ["website"], "geometry": ["point", "area"], "terms": ["open space"], "tags": {"leisure": "common"}, "name": "Common"},
     "leisure/dance": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"},
     "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"},
@@ -691,7 +691,7 @@
     "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "marsh", "reedbed", "swamp", "tidalflat"], "name": "Wetland"},
     "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"},
     "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
-    "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["operator", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
+    "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "operator", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
     "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "terms": [], "searchable": false, "name": "Administrative Office", "replacement": "office/government"},
     "office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"},
     "office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "terms": [], "name": "Travel Agency", "searchable": false},
@@ -815,7 +815,7 @@
     "public_transport/station_train": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "train": "yes"}, "addTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "removeTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["public transit", "public transportation", "rail", "station", "terminal", "track", "train", "transit", "transportation"], "name": "Train Station"},
     "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Station"},
     "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "removeTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Station / Terminal"},
-    "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
+    "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
     "public_transport/stop_area": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "addTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "removeTags": {"type": "public_transport", "public_transport": "stop_area", "public_transport:version": "2"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"},
     "public_transport/stop_position_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stopping Location"},
     "public_transport/stop_position_bus": {"icon": "maki-bus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "bus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stopping Location"},
@@ -859,7 +859,7 @@
     "seamark/buoy_lateral/green": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"},
     "seamark/buoy_lateral/red": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"},
     "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"},
-    "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["brand", "currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
+    "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
     "shop/fishmonger": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false},
     "shop/furnace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["oven", "stove"], "tags": {"shop": "furnace"}, "name": "Furnace Store", "searchable": false},
     "shop/vacant": {"icon": "maki-shop", "fields": ["name", "address", "building_area"], "geometry": ["point", "area"], "tags": {"shop": "vacant"}, "name": "Vacant Shop", "searchable": false},
@@ -1011,18 +1011,18 @@
     "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "attraction"}, "name": "Tourist Attraction"},
     "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "internet_access"], "moreFields": ["payment_multi", "internet_access/fee", "internet_access/ssid", "sanitary_dump_station", "power_supply", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
     "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access"], "moreFields": ["operator", "fee", "payment_multi", "internet_access/fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
-    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
+    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
     "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
-    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
-    "tourism/hostel": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"},
-    "tourism/hotel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "stars", "website", "phone", "email", "fax", "wheelchair", "bar"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
+    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
+    "tourism/hostel": {"icon": "maki-lodging", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"},
+    "tourism/hotel": {"icon": "maki-lodging", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "stars", "bar"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
     "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"},
     "tourism/information/board": {"icon": "maki-information", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"},
     "tourism/information/guidepost": {"icon": "maki-information", "fields": ["name", "elevation", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"},
     "tourism/information/map": {"icon": "maki-information", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"},
     "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
-    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
-    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
+    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["air_conditioning", "operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
+    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
     "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["smoking", "fee", "payment_multi", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
     "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
     "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json
index f11091018..7e8931263 100644
--- a/data/presets/presets/amenity/bank.json
+++ b/data/presets/presets/amenity/bank.json
@@ -9,6 +9,7 @@
         "drive_through"
     ],
     "moreFields": [
+        "air_conditioning",
         "opening_hours",
         "currency_multi",
         "website",
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
index 028828382..35c3828e9 100644
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -8,6 +8,7 @@
         "brewery"
     ],
     "moreFields": [
+        "air_conditioning",
         "email",
         "fax",
         "microbrewery",
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
index b096c8ced..edfff4ac7 100644
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -8,6 +8,7 @@
         "outdoor_seating"
     ],
     "moreFields": [
+        "air_conditioning",
         "diet_multi",
         "takeaway",
         "delivery",
@@ -38,4 +39,4 @@
         "amenity": "cafe"
     },
     "name": "Cafe"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/amenity/casino.json b/data/presets/presets/amenity/casino.json
index 714b55917..483a78e11 100644
--- a/data/presets/presets/amenity/casino.json
+++ b/data/presets/presets/amenity/casino.json
@@ -9,6 +9,7 @@
         "smoking"
     ],
     "moreFields": [
+        "air_conditioning",
         "payment_multi",
         "website",
         "phone",
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
index 2837a22a0..06567c413 100644
--- a/data/presets/presets/amenity/cinema.json
+++ b/data/presets/presets/amenity/cinema.json
@@ -8,6 +8,7 @@
         "payment_multi"
     ],
     "moreFields": [
+        "air_conditioning",
         "website",
         "phone",
         "email",
diff --git a/data/presets/presets/amenity/clinic.json b/data/presets/presets/amenity/clinic.json
index fa551dd3f..9f1befa90 100644
--- a/data/presets/presets/amenity/clinic.json
+++ b/data/presets/presets/amenity/clinic.json
@@ -9,6 +9,7 @@
         "opening_hours"
     ],
     "moreFields": [
+        "air_conditioning",
         "payment_multi",
         "website",
         "phone",
diff --git a/data/presets/presets/amenity/community_centre.json b/data/presets/presets/amenity/community_centre.json
index 1a40a0278..9c59a9005 100644
--- a/data/presets/presets/amenity/community_centre.json
+++ b/data/presets/presets/amenity/community_centre.json
@@ -7,6 +7,7 @@
         "building_area"
     ],
     "moreFields": [
+        "air_conditioning",
         "website",
         "phone",
         "email",
diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
index 5108e6129..69a423b22 100644
--- a/data/presets/presets/amenity/fast_food.json
+++ b/data/presets/presets/amenity/fast_food.json
@@ -9,6 +9,7 @@
         "drive_through"
     ],
     "moreFields": [
+        "air_conditioning",
         "opening_hours",
         "diet_multi",
         "takeaway",
diff --git a/data/presets/presets/amenity/internet_cafe.json b/data/presets/presets/amenity/internet_cafe.json
index 38ae41218..8343a2621 100644
--- a/data/presets/presets/amenity/internet_cafe.json
+++ b/data/presets/presets/amenity/internet_cafe.json
@@ -10,6 +10,7 @@
         "internet_access/ssid"
     ],
     "moreFields": [
+        "air_conditioning",
         "opening_hours",
         "smoking",
         "outdoor_seating",
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
index 1eeb3bba5..ead76f591 100644
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -10,6 +10,7 @@
     ],
     "moreFields" : [
         "access_simple",
+        "air_conditioning",
         "opening_hours",
         "internet_access/fee",
         "internet_access/ssid",
diff --git a/data/presets/presets/amenity/nightclub.json b/data/presets/presets/amenity/nightclub.json
index e538673f9..df70c55d9 100644
--- a/data/presets/presets/amenity/nightclub.json
+++ b/data/presets/presets/amenity/nightclub.json
@@ -9,6 +9,7 @@
         "smoking"
     ],
     "moreFields": [
+        "air_conditioning",
         "payment_multi",
         "website",
         "phone",
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
index 5ee14bf9f..6e5fc530f 100644
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -9,6 +9,7 @@
         "service_times"
     ],
     "moreFields": [
+        "air_conditioning",
         "opening_hours",
         "internet_access",
         "internet_access/ssid",
diff --git a/data/presets/presets/amenity/planetarium.json b/data/presets/presets/amenity/planetarium.json
index b8f3833d8..f772002d1 100644
--- a/data/presets/presets/amenity/planetarium.json
+++ b/data/presets/presets/amenity/planetarium.json
@@ -8,6 +8,7 @@
         "opening_hours"
     ],
     "moreFields": [
+        "air_conditioning",
         "fee",
         "payment_multi",
         "website",
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
index f98fed737..cdd170764 100644
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -9,6 +9,7 @@
         "brewery"
     ],
     "moreFields": [
+        "air_conditioning",
         "diet_multi",
         "email",
         "fax",
diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json
index 8e6aa9e81..99150a334 100644
--- a/data/presets/presets/amenity/restaurant.json
+++ b/data/presets/presets/amenity/restaurant.json
@@ -9,6 +9,7 @@
         "outdoor_seating"
     ],
     "moreFields": [
+        "air_conditioning",
         "bar",
         "brewery",
         "capacity",
diff --git a/data/presets/presets/amenity/theatre.json b/data/presets/presets/amenity/theatre.json
index 872a21ab5..bc0183e71 100644
--- a/data/presets/presets/amenity/theatre.json
+++ b/data/presets/presets/amenity/theatre.json
@@ -7,6 +7,7 @@
         "building_area"
     ],
     "moreFields": [
+        "air_conditioning",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json
index 1812b03b4..a8e3f72fa 100644
--- a/data/presets/presets/craft.json
+++ b/data/presets/presets/craft.json
@@ -9,6 +9,7 @@
         "opening_hours"
     ],
     "moreFields": [
+        "air_conditioning",
         "product",
         "website",
         "phone",
diff --git a/data/presets/presets/leisure/amusement_arcade.json b/data/presets/presets/leisure/amusement_arcade.json
index d224ea453..3f7a1fa69 100644
--- a/data/presets/presets/leisure/amusement_arcade.json
+++ b/data/presets/presets/leisure/amusement_arcade.json
@@ -7,6 +7,7 @@
         "building_area"
     ],
     "moreFields": [
+        "air_conditioning",
         "opening_hours",
         "payment_multi",
         "smoking",
diff --git a/data/presets/presets/leisure/bowling_alley.json b/data/presets/presets/leisure/bowling_alley.json
index a32a4a8d5..58cc08f06 100644
--- a/data/presets/presets/leisure/bowling_alley.json
+++ b/data/presets/presets/leisure/bowling_alley.json
@@ -7,6 +7,7 @@
         "building_area"
     ],
     "moreFields": [
+        "air_conditioning",
         "opening_hours",
         "payment_multi",
         "smoking",
@@ -20,7 +21,7 @@
         "area"
     ],
     "terms": [
-      "bowling center"
+        "bowling center"
     ],
     "tags": {
         "leisure": "bowling_alley"
diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json
index 2134702fb..c78d863d0 100644
--- a/data/presets/presets/office.json
+++ b/data/presets/presets/office.json
@@ -8,6 +8,7 @@
         "opening_hours"
     ],
     "moreFields": [
+        "air_conditioning",
         "operator",
         "smoking",
         "website",
diff --git a/data/presets/presets/public_transport/station.json b/data/presets/presets/public_transport/station.json
index a8c2392e1..126cf7f0f 100644
--- a/data/presets/presets/public_transport/station.json
+++ b/data/presets/presets/public_transport/station.json
@@ -9,6 +9,7 @@
         "internet_access"
     ],
     "moreFields": [
+        "air_conditioning",
         "internet_access/fee",
         "internet_access/ssid",
         "website",
diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json
index 0e5850906..8a88a2ba1 100644
--- a/data/presets/presets/shop.json
+++ b/data/presets/presets/shop.json
@@ -10,6 +10,7 @@
         "payment_multi"
     ],
     "moreFields": [
+        "air_conditioning",
         "brand",
         "currency_multi",
         "website",
diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json
index 61b36fc96..ea0de7396 100644
--- a/data/presets/presets/tourism/chalet.json
+++ b/data/presets/presets/tourism/chalet.json
@@ -8,6 +8,7 @@
         "internet_access"
     ],
     "moreFields" : [
+        "air_conditioning",
         "smoking",
         "payment_multi",
         "internet_access/fee",
diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json
index 7c07b291b..1879f9fe5 100644
--- a/data/presets/presets/tourism/guest_house.json
+++ b/data/presets/presets/tourism/guest_house.json
@@ -9,6 +9,7 @@
         "internet_access"
     ],
     "moreFields" : [
+        "air_conditioning",
         "smoking",
         "payment_multi",
         "internet_access/fee",
diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json
index ceeb66121..d3dca59dd 100644
--- a/data/presets/presets/tourism/hostel.json
+++ b/data/presets/presets/tourism/hostel.json
@@ -1,23 +1,10 @@
 {
     "icon": "maki-lodging",
     "fields": [
-        "name",
-        "operator",
-        "address",
-        "building_area",
-        "rooms",
-        "internet_access"
+        "{tourism/guest_house}"
     ],
     "moreFields" : [
-        "smoking",
-        "payment_multi",
-        "internet_access/fee",
-        "internet_access/ssid",
-        "website",
-        "phone",
-        "email",
-        "fax",
-        "wheelchair"
+        "{tourism/guest_house}"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json
index e9158cd84..a7a3b2885 100644
--- a/data/presets/presets/tourism/hotel.json
+++ b/data/presets/presets/tourism/hotel.json
@@ -1,25 +1,11 @@
 {
     "icon": "maki-lodging",
     "fields": [
-        "name",
-        "brand",
-        "address",
-        "building_area",
-        "rooms",
-        "internet_access"
+        "{tourism/motel}"
     ],
     "moreFields": [
-        "operator",
-        "smoking",
-        "payment_multi",
-        "internet_access/fee",
-        "internet_access/ssid",
+        "{tourism/motel}",
         "stars",
-        "website",
-        "phone",
-        "email",
-        "fax",
-        "wheelchair",
         "bar"
     ],
     "geometry": [
@@ -30,4 +16,4 @@
         "tourism": "hotel"
     },
     "name": "Hotel"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json
index bdadb0293..995f9a26c 100644
--- a/data/presets/presets/tourism/motel.json
+++ b/data/presets/presets/tourism/motel.json
@@ -9,6 +9,7 @@
         "internet_access"
     ],
     "moreFields" : [
+        "air_conditioning",
         "operator",
         "smoking",
         "payment_multi",
diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json
index f79e61b28..72af44172 100644
--- a/data/presets/presets/tourism/museum.json
+++ b/data/presets/presets/tourism/museum.json
@@ -8,6 +8,7 @@
         "opening_hours"
     ],
     "moreFields": [
+        "air_conditioning",
         "fee",
         "payment_multi",
         "website",
diff --git a/data/taginfo.json b/data/taginfo.json
index 211454d72..24753e0b2 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1104,6 +1104,7 @@
     {"key": "aerialway:summer:access", "value": "exit", "description": "🄵 Access (summer)"},
     {"key": "aerialway:summer:access", "value": "both", "description": "🄵 Access (summer)"},
     {"key": "agrarian", "description": "🄵 Products"},
+    {"key": "air_conditioning", "description": "🄵 Air Conditioning"},
     {"key": "animal_boarding", "description": "🄵 For Animals"},
     {"key": "animal_breeding", "description": "🄵 For Animals"},
     {"key": "animal_shelter", "description": "🄵 For Animals"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f67325e22..859da3624 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2262,6 +2262,9 @@
                 "agrarian": {
                     "label": "Products"
                 },
+                "air_conditioning": {
+                    "label": "Air Conditioning"
+                },
                 "amenity": {
                     "label": "Type"
                 },