diff --git a/data/presets.yaml b/data/presets.yaml
index 0dd5a484f..06b61f8e1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2472,6 +2472,11 @@ en:
         name: Monastery Grounds
         # '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'
         terms: '<translate with synonyms or related terms for ''Monastery Grounds'', separated by commas>'
+      amenity/money_transfer:
+        # amenity=money_transfer
+        name: Money Transfer Station
+        # 'terms: money order,check,bill,currency,finance,wire transfer,cable,person to person,cash to cash,exchange'
+        terms: '<translate with synonyms or related terms for ''Money Transfer Station'', separated by commas>'
       amenity/motorcycle_parking:
         # amenity=motorcycle_parking
         name: Motorcycle Parking
@@ -2507,6 +2512,16 @@ en:
         # amenity=parking_space
         name: Parking Space
         terms: '<translate with synonyms or related terms for ''Parking Space'', separated by commas>'
+      amenity/payment_centre:
+        # amenity=payment_centre
+        name: Payment Center
+        # 'terms: check,tax pay,bill pay,currency,finance,cash,money'
+        terms: '<translate with synonyms or related terms for ''Payment Center'', separated by commas>'
+      amenity/payment_terminal:
+        # amenity=payment_terminal
+        name: Payment Terminal
+        # 'terms: interactive kiosk,ekiosk,atm,bill pay,tax pay,phone pay,finance,cash,money transfer,card'
+        terms: '<translate with synonyms or related terms for ''Payment Terminal'', separated by commas>'
       amenity/pharmacy:
         # amenity=pharmacy
         name: Pharmacy
@@ -5877,6 +5892,10 @@ en:
         name: Carpet Store
         # 'terms: rug'
         terms: '<translate with synonyms or related terms for ''Carpet Store'', separated by commas>'
+      shop/catalogue:
+        # shop=catalogue
+        name: Catalog Shop
+        terms: '<translate with synonyms or related terms for ''Catalog Shop'', separated by commas>'
       shop/charity:
         # shop=charity
         name: Charity Store
@@ -5924,6 +5943,10 @@ en:
         # shop=cosmetics
         name: Cosmetics Store
         terms: '<translate with synonyms or related terms for ''Cosmetics Store'', separated by commas>'
+      shop/country_store:
+        # shop=country_store
+        name: Country Store
+        terms: '<translate with synonyms or related terms for ''Country Store'', separated by commas>'
       shop/craft:
         # shop=craft
         name: Arts and Crafts Store
@@ -6036,6 +6059,11 @@ en:
         name: Hairdresser
         # 'terms: barber'
         terms: '<translate with synonyms or related terms for ''Hairdresser'', separated by commas>'
+      shop/hairdresser_supply:
+        # shop=hairdresser_supply
+        name: Hairdresser Supply Store
+        # 'terms: barber,shampoo,conditioner'
+        terms: '<translate with synonyms or related terms for ''Hairdresser Supply Store'', separated by commas>'
       shop/hardware:
         # shop=hardware
         name: Hardware Store
@@ -6164,6 +6192,11 @@ en:
         # shop=paint
         name: Paint Store
         terms: '<translate with synonyms or related terms for ''Paint Store'', separated by commas>'
+      shop/party:
+        # shop=party
+        name: Party Supply Store
+        # 'terms: balloons,costumes,decorations,invitations'
+        terms: '<translate with synonyms or related terms for ''Party Supply Store'', separated by commas>'
       shop/pastry:
         # shop=pastry
         name: Pastry Shop
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 10b2c7aa6..2d2826a21 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -107,6 +107,7 @@
     "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
     "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
     "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "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", "opening_hours", "currency_multi"], "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"], "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"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
@@ -114,6 +115,8 @@
     "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
     "amenity/parking": {"icon": "maki-car", "fields": ["name", "operator", "parking", "capacity", "fee", "access_simple", "supervised", "park_ride", "surface", "maxstay"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["car", "parking lot"], "name": "Parking Lot"},
     "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["name", "operator", "building", "levels", "height", "address", "capacity", "fee", "access_simple"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "removeTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Parking Garage"},
+    "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
+    "amenity/payment_terminal": {"icon": "maki-bank", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "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", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug*", "med*", "prescription"], "name": "Pharmacy"},
     "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "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", "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"},
@@ -847,6 +850,7 @@
     "shop/car_repair": {"icon": "maki-car-repair", "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
     "shop/car": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "car"}, "name": "Car Dealership"},
     "shop/carpet": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"},
+    "shop/catalogue": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "catalogue"}, "name": "Catalog Shop"},
     "shop/charity": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["thrift", "op shop", "nonprofit"], "tags": {"shop": "charity"}, "name": "Charity Store"},
     "shop/cheese": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "cheese"}, "name": "Cheese Store"},
     "shop/chemist": {"icon": "maki-grocery", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "med*", "drug*", "gift"], "name": "Drugstore"},
@@ -858,6 +862,7 @@
     "shop/convenience": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "convenience"}, "name": "Convenience Store"},
     "shop/copyshop": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "copyshop"}, "name": "Copy Store"},
     "shop/cosmetics": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "name": "Cosmetics Store"},
+    "shop/country_store": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "country_store"}, "name": "Country Store"},
     "shop/craft": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "craft"}, "terms": ["art*", "paint*", "frame"], "name": "Arts and Crafts Store"},
     "shop/curtain": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["drape*", "window"], "tags": {"shop": "curtain"}, "name": "Curtain Store"},
     "shop/dairy": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["milk", "egg", "cheese"], "tags": {"shop": "dairy"}, "name": "Dairy Store"},
@@ -879,6 +884,7 @@
     "shop/gas": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["cng", "lpg", "natural gas", "propane", "refill", "tank"], "tags": {"shop": "gas"}, "name": "Bottled Gas Shop"},
     "shop/gift": {"icon": "maki-gift", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["souvenir"], "tags": {"shop": "gift"}, "name": "Gift Shop"},
     "shop/greengrocer": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["fruit", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"},
+    "shop/hairdresser_supply": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["barber", "shampoo", "conditioner"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"},
     "shop/hairdresser": {"icon": "maki-hairdresser", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["barber"], "tags": {"shop": "hairdresser"}, "name": "Hairdresser"},
     "shop/hardware": {"icon": "temaki-tools", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "hardware"}, "name": "Hardware Store"},
     "shop/health_food": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["wholefood", "vitamins", "vegetarian", "vegan"], "tags": {"shop": "health_food"}, "name": "Health Food Shop"},
@@ -909,6 +915,7 @@
     "shop/organic": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "name": "Organic Goods Store"},
     "shop/outdoor": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"},
     "shop/paint": {"icon": "fas-paint-roller", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "paint"}, "name": "Paint Store"},
+    "shop/party": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["balloons", "costumes", "decorations", "invitations"], "tags": {"shop": "party"}, "name": "Party Supply Store"},
     "shop/pastry": {"icon": "maki-bakery", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "pastry"}, "terms": ["patisserie", "cake shop", "cakery"], "name": "Pastry Shop"},
     "shop/pawnbroker": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "pawnbroker"}, "name": "Pawn Shop"},
     "shop/perfumery": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "perfumery"}, "name": "Perfume Store"},
@@ -1774,6 +1781,10 @@
     "amenity/ice_cream/Freddo": {"name": "Freddo", "icon": "maki-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "takeaway", "delivery", "outdoor_seating"], "geometry": ["point", "area"], "tags": {"amenity": "ice_cream", "brand:wikidata": "Q28823999"}, "addTags": {"amenity": "ice_cream", "brand": "Freddo", "brand:wikidata": "Q28823999", "brand:wikipedia": "es:Freddo", "cuisine": "ice_cream", "name": "Freddo"}, "removeTags": {"amenity": "ice_cream", "brand": "Freddo", "brand:wikidata": "Q28823999", "brand:wikipedia": "es:Freddo", "cuisine": "ice_cream", "name": "Freddo"}, "matchScore": 2, "suggestion": true},
     "amenity/ice_cream/Grido": {"name": "Grido", "icon": "maki-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "takeaway", "delivery", "outdoor_seating"], "geometry": ["point", "area"], "tags": {"amenity": "ice_cream", "brand:wikidata": "Q5885724"}, "addTags": {"amenity": "ice_cream", "brand": "Grido", "brand:wikidata": "Q5885724", "brand:wikipedia": "es:Grido Helado", "cuisine": "ice_cream", "name": "Grido"}, "removeTags": {"amenity": "ice_cream", "brand": "Grido", "brand:wikidata": "Q5885724", "brand:wikipedia": "es:Grido Helado", "cuisine": "ice_cream", "name": "Grido"}, "matchScore": 2, "suggestion": true},
     "amenity/ice_cream/sweetFrog": {"name": "sweetFrog", "icon": "maki-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "takeaway", "delivery", "outdoor_seating"], "geometry": ["point", "area"], "tags": {"amenity": "ice_cream", "brand:wikidata": "Q16952110"}, "addTags": {"amenity": "ice_cream", "brand": "sweetFrog", "brand:wikidata": "Q16952110", "brand:wikipedia": "en:Sweet Frog", "cuisine": "frozen_yogurt", "name": "sweetFrog"}, "removeTags": {"amenity": "ice_cream", "brand": "sweetFrog", "brand:wikidata": "Q16952110", "brand:wikipedia": "en:Sweet Frog", "cuisine": "frozen_yogurt", "name": "sweetFrog"}, "matchScore": 2, "suggestion": true},
+    "amenity/money_transfer/Express Union": {"name": "Express Union", "icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "currency_multi"], "geometry": ["point", "area"], "tags": {"amenity": "money_transfer", "brand:wikidata": "Q3062276"}, "addTags": {"amenity": "money_transfer", "brand": "Express Union", "brand:wikidata": "Q3062276", "brand:wikipedia": "fr:Express Union", "name": "Express Union"}, "removeTags": {"amenity": "money_transfer", "brand": "Express Union", "brand:wikidata": "Q3062276", "brand:wikipedia": "fr:Express Union", "name": "Express Union"}, "matchScore": 2, "suggestion": true},
+    "amenity/money_transfer/Western Union": {"name": "Western Union", "icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "currency_multi"], "geometry": ["point", "area"], "tags": {"amenity": "money_transfer", "brand:wikidata": "Q861042"}, "addTags": {"amenity": "money_transfer", "brand": "Western Union", "brand:wikidata": "Q861042", "brand:wikipedia": "en:Western Union", "name": "Western Union"}, "removeTags": {"amenity": "money_transfer", "brand": "Western Union", "brand:wikidata": "Q861042", "brand:wikipedia": "en:Western Union", "name": "Western Union"}, "matchScore": 2, "suggestion": true},
+    "amenity/payment_centre/Rapipago": {"name": "Rapipago", "icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "payment_centre", "brand:wikidata": "Q6100413"}, "addTags": {"amenity": "payment_centre", "brand": "Rapipago", "brand:wikidata": "Q6100413", "brand:wikipedia": "es:Rapipago", "name": "Rapipago"}, "removeTags": {"amenity": "payment_centre", "brand": "Rapipago", "brand:wikidata": "Q6100413", "brand:wikipedia": "es:Rapipago", "name": "Rapipago"}, "matchScore": 2, "suggestion": true},
+    "amenity/payment_terminal/Qiwi": {"name": "Qiwi", "icon": "maki-bank", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "geometry": ["point"], "tags": {"amenity": "payment_terminal", "brand:wikidata": "Q4047736"}, "addTags": {"amenity": "payment_terminal", "brand": "Qiwi", "brand:wikidata": "Q4047736", "brand:wikipedia": "en:Qiwi", "name": "Qiwi"}, "removeTags": {"amenity": "payment_terminal", "brand": "Qiwi", "brand:wikidata": "Q4047736", "brand:wikipedia": "en:Qiwi", "name": "Qiwi"}, "matchScore": 2, "suggestion": true},
     "amenity/pharmacy/Apotek Hjärtat": {"name": "Apotek Hjärtat", "icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q10416114"}, "addTags": {"amenity": "pharmacy", "brand": "Apotek Hjärtat", "brand:wikidata": "Q10416114", "brand:wikipedia": "sv:Apotek Hjärtat", "healthcare": "pharmacy", "name": "Apotek Hjärtat"}, "removeTags": {"amenity": "pharmacy", "brand": "Apotek Hjärtat", "brand:wikidata": "Q10416114", "brand:wikipedia": "sv:Apotek Hjärtat", "healthcare": "pharmacy", "name": "Apotek Hjärtat"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
     "amenity/pharmacy/Bartell Drugs": {"name": "Bartell Drugs", "icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q4865152"}, "addTags": {"amenity": "pharmacy", "brand": "Bartell Drugs", "brand:wikidata": "Q4865152", "brand:wikipedia": "en:Bartell Drugs", "healthcare": "pharmacy", "name": "Bartell Drugs"}, "removeTags": {"amenity": "pharmacy", "brand": "Bartell Drugs", "brand:wikidata": "Q4865152", "brand:wikipedia": "en:Bartell Drugs", "healthcare": "pharmacy", "name": "Bartell Drugs"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
     "amenity/pharmacy/Chemist Warehouse": {"name": "Chemist Warehouse", "icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q48782120"}, "addTags": {"amenity": "pharmacy", "brand": "Chemist Warehouse", "brand:wikidata": "Q48782120", "brand:wikipedia": "en:Chemist Warehouse", "healthcare": "pharmacy", "name": "Chemist Warehouse"}, "removeTags": {"amenity": "pharmacy", "brand": "Chemist Warehouse", "brand:wikidata": "Q48782120", "brand:wikipedia": "en:Chemist Warehouse", "healthcare": "pharmacy", "name": "Chemist Warehouse"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
@@ -2080,6 +2091,7 @@
     "shop/car/Volkswagen": {"name": "Volkswagen", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q246"}, "addTags": {"brand": "Volkswagen", "brand:wikidata": "Q246", "brand:wikipedia": "en:Volkswagen", "name": "Volkswagen", "shop": "car"}, "removeTags": {"brand": "Volkswagen", "brand:wikidata": "Q246", "brand:wikipedia": "en:Volkswagen", "name": "Volkswagen", "shop": "car"}, "matchScore": 2, "suggestion": true},
     "shop/car/Volvo": {"name": "Volvo", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q215293"}, "addTags": {"brand": "Volvo", "brand:wikidata": "Q215293", "brand:wikipedia": "en:Volvo Cars", "name": "Volvo", "shop": "car"}, "removeTags": {"brand": "Volvo", "brand:wikidata": "Q215293", "brand:wikipedia": "en:Volvo Cars", "name": "Volvo", "shop": "car"}, "matchScore": 2, "suggestion": true},
     "shop/car/ホンダ": {"name": "ホンダ", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q9584"}, "addTags": {"brand": "ホンダ", "brand:en": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "ja:本田技研工業", "name": "ホンダ", "name:en": "Honda", "shop": "car"}, "removeTags": {"brand": "ホンダ", "brand:en": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "ja:本田技研工業", "name": "ホンダ", "name:en": "Honda", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/catalogue/Argos": {"name": "Argos", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "catalogue", "brand:wikidata": "Q4789707"}, "addTags": {"brand": "Argos", "brand:wikidata": "Q4789707", "brand:wikipedia": "en:Argos (retailer)", "name": "Argos", "shop": "catalogue"}, "removeTags": {"brand": "Argos", "brand:wikidata": "Q4789707", "brand:wikipedia": "en:Argos (retailer)", "name": "Argos", "shop": "catalogue"}, "matchScore": 2, "suggestion": true},
     "shop/charity/Age UK": {"name": "Age UK", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "charity", "brand:wikidata": "Q4691850"}, "addTags": {"brand": "Age UK", "brand:wikidata": "Q4691850", "brand:wikipedia": "en:Age UK", "name": "Age UK", "shop": "charity"}, "removeTags": {"brand": "Age UK", "brand:wikidata": "Q4691850", "brand:wikipedia": "en:Age UK", "name": "Age UK", "shop": "charity"}, "matchScore": 2, "suggestion": true},
     "shop/charity/Barnardo's": {"name": "Barnardo's", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "charity", "brand:wikidata": "Q2884670"}, "addTags": {"brand": "Barnardo's", "brand:wikidata": "Q2884670", "brand:wikipedia": "en:Barnardo's", "name": "Barnardo's", "shop": "charity"}, "removeTags": {"brand": "Barnardo's", "brand:wikidata": "Q2884670", "brand:wikipedia": "en:Barnardo's", "name": "Barnardo's", "shop": "charity"}, "matchScore": 2, "suggestion": true},
     "shop/charity/British Heart Foundation": {"name": "British Heart Foundation", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "charity", "brand:wikidata": "Q4970039"}, "addTags": {"brand": "British Heart Foundation", "brand:wikidata": "Q4970039", "brand:wikipedia": "en:British Heart Foundation", "name": "British Heart Foundation", "shop": "charity"}, "removeTags": {"brand": "British Heart Foundation", "brand:wikidata": "Q4970039", "brand:wikipedia": "en:British Heart Foundation", "name": "British Heart Foundation", "shop": "charity"}, "matchScore": 2, "suggestion": true},
@@ -2288,6 +2300,8 @@
     "shop/cosmetics/The Body Shop": {"name": "The Body Shop", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "cosmetics", "brand:wikidata": "Q837851"}, "addTags": {"brand": "The Body Shop", "brand:wikidata": "Q837851", "brand:wikipedia": "en:The Body Shop", "name": "The Body Shop", "shop": "cosmetics"}, "removeTags": {"brand": "The Body Shop", "brand:wikidata": "Q837851", "brand:wikipedia": "en:The Body Shop", "name": "The Body Shop", "shop": "cosmetics"}, "matchScore": 2, "suggestion": true},
     "shop/cosmetics/Л'Этуаль": {"name": "Л'Этуаль", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "cosmetics", "brand:wikidata": "Q18400706"}, "addTags": {"brand": "Л'Этуаль", "brand:wikidata": "Q18400706", "brand:wikipedia": "ru:Л’Этуаль", "name": "Л'Этуаль", "shop": "cosmetics"}, "removeTags": {"brand": "Л'Этуаль", "brand:wikidata": "Q18400706", "brand:wikipedia": "ru:Л’Этуаль", "name": "Л'Этуаль", "shop": "cosmetics"}, "matchScore": 2, "suggestion": true},
     "shop/cosmetics/Магнит Косметик": {"name": "Магнит Косметик", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "cosmetics", "brand:wikidata": "Q940518"}, "addTags": {"brand": "Магнит Косметик", "brand:en": "Magnit Cosmetics", "brand:wikidata": "Q940518", "brand:wikipedia": "ru:Магнит (сеть магазинов)", "name": "Магнит Косметик", "name:en": "Magnit Cosmetics", "shop": "cosmetics"}, "removeTags": {"brand": "Магнит Косметик", "brand:en": "Magnit Cosmetics", "brand:wikidata": "Q940518", "brand:wikipedia": "ru:Магнит (сеть магазинов)", "name": "Магнит Косметик", "name:en": "Magnit Cosmetics", "shop": "cosmetics"}, "matchScore": 2, "suggestion": true},
+    "shop/country_store/Rural King": {"name": "Rural King", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "country_store", "brand:wikidata": "Q7380525"}, "addTags": {"brand": "Rural King", "brand:wikidata": "Q7380525", "brand:wikipedia": "en:Rural King", "name": "Rural King", "shop": "country_store"}, "removeTags": {"brand": "Rural King", "brand:wikidata": "Q7380525", "brand:wikipedia": "en:Rural King", "name": "Rural King", "shop": "country_store"}, "matchScore": 2, "suggestion": true},
+    "shop/country_store/Tractor Supply Company": {"name": "Tractor Supply Company", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "country_store", "brand:wikidata": "Q15109925"}, "addTags": {"brand": "Tractor Supply Company", "brand:wikidata": "Q15109925", "brand:wikipedia": "en:Tractor Supply Company", "name": "Tractor Supply Company", "shop": "country_store"}, "removeTags": {"brand": "Tractor Supply Company", "brand:wikidata": "Q15109925", "brand:wikipedia": "en:Tractor Supply Company", "name": "Tractor Supply Company", "shop": "country_store"}, "matchScore": 2, "suggestion": true},
     "shop/craft/Hobby Lobby": {"name": "Hobby Lobby", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "craft", "brand:wikidata": "Q5874938"}, "addTags": {"brand": "Hobby Lobby", "brand:wikidata": "Q5874938", "brand:wikipedia": "en:Hobby Lobby", "name": "Hobby Lobby", "shop": "craft"}, "removeTags": {"brand": "Hobby Lobby", "brand:wikidata": "Q5874938", "brand:wikipedia": "en:Hobby Lobby", "name": "Hobby Lobby", "shop": "craft"}, "matchScore": 2, "suggestion": true},
     "shop/craft/Michaels": {"name": "Michaels", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "craft", "brand:wikidata": "Q6835667"}, "addTags": {"brand": "Michaels", "brand:wikidata": "Q6835667", "brand:wikipedia": "en:Michaels", "name": "Michaels", "shop": "craft"}, "removeTags": {"brand": "Michaels", "brand:wikidata": "Q6835667", "brand:wikipedia": "en:Michaels", "name": "Michaels", "shop": "craft"}, "matchScore": 2, "suggestion": true},
     "shop/department_store/Belk": {"name": "Belk", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "department_store", "brand:wikidata": "Q127428"}, "addTags": {"brand": "Belk", "brand:wikidata": "Q127428", "brand:wikipedia": "en:Belk", "name": "Belk", "shop": "department_store"}, "removeTags": {"brand": "Belk", "brand:wikidata": "Q127428", "brand:wikipedia": "en:Belk", "name": "Belk", "shop": "department_store"}, "matchScore": 2, "suggestion": true},
@@ -2412,6 +2426,7 @@
     "shop/gift/Card Factory": {"name": "Card Factory", "icon": "maki-gift", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "gift", "brand:wikidata": "Q5038192"}, "addTags": {"brand": "Card Factory", "brand:wikidata": "Q5038192", "brand:wikipedia": "en:Card Factory", "name": "Card Factory", "shop": "gift"}, "removeTags": {"brand": "Card Factory", "brand:wikidata": "Q5038192", "brand:wikipedia": "en:Card Factory", "name": "Card Factory", "shop": "gift"}, "matchScore": 2, "suggestion": true},
     "shop/gift/Hallmark": {"name": "Hallmark", "icon": "maki-gift", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "gift", "brand:wikidata": "Q1521910"}, "addTags": {"brand": "Hallmark", "brand:wikidata": "Q1521910", "brand:wikipedia": "en:Hallmark Cards", "name": "Hallmark", "shop": "gift"}, "removeTags": {"brand": "Hallmark", "brand:wikidata": "Q1521910", "brand:wikipedia": "en:Hallmark Cards", "name": "Hallmark", "shop": "gift"}, "matchScore": 2, "suggestion": true},
     "shop/gift/Nanu-Nana": {"name": "Nanu-Nana", "icon": "maki-gift", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "gift", "brand:wikidata": "Q1720245"}, "addTags": {"brand": "Nanu-Nana", "brand:wikidata": "Q1720245", "brand:wikipedia": "de:Nanu-Nana", "name": "Nanu-Nana", "shop": "gift"}, "removeTags": {"brand": "Nanu-Nana", "brand:wikidata": "Q1720245", "brand:wikipedia": "de:Nanu-Nana", "name": "Nanu-Nana", "shop": "gift"}, "matchScore": 2, "suggestion": true},
+    "shop/hairdresser_supply/Sally Beauty Supply": {"name": "Sally Beauty Supply", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "hairdresser_supply", "brand:wikidata": "Q7405065"}, "addTags": {"brand": "Sally Beauty Supply", "brand:wikidata": "Q7405065", "brand:wikipedia": "en:Sally Beauty Holdings", "name": "Sally Beauty Supply", "shop": "hairdresser_supply"}, "removeTags": {"brand": "Sally Beauty Supply", "brand:wikidata": "Q7405065", "brand:wikipedia": "en:Sally Beauty Holdings", "name": "Sally Beauty Supply", "shop": "hairdresser_supply"}, "matchScore": 2, "suggestion": true},
     "shop/hairdresser/Fantastic Sams": {"name": "Fantastic Sams", "icon": "maki-hairdresser", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5434222"}, "addTags": {"brand": "Fantastic Sams", "brand:wikidata": "Q5434222", "brand:wikipedia": "en:Fantastic Sams", "name": "Fantastic Sams", "shop": "hairdresser"}, "removeTags": {"brand": "Fantastic Sams", "brand:wikidata": "Q5434222", "brand:wikipedia": "en:Fantastic Sams", "name": "Fantastic Sams", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
     "shop/hairdresser/First Choice Haircutters": {"name": "First Choice Haircutters", "icon": "maki-hairdresser", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5452622"}, "addTags": {"brand": "First Choice Haircutters", "brand:wikidata": "Q5452622", "brand:wikipedia": "en:First Choice Haircutters", "name": "First Choice Haircutters", "shop": "hairdresser"}, "removeTags": {"brand": "First Choice Haircutters", "brand:wikidata": "Q5452622", "brand:wikipedia": "en:First Choice Haircutters", "name": "First Choice Haircutters", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
     "shop/hairdresser/Great Clips": {"name": "Great Clips", "icon": "maki-hairdresser", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5598967"}, "addTags": {"brand": "Great Clips", "brand:wikidata": "Q5598967", "brand:wikipedia": "en:Great Clips", "name": "Great Clips", "shop": "hairdresser"}, "removeTags": {"brand": "Great Clips", "brand:wikidata": "Q5598967", "brand:wikipedia": "en:Great Clips", "name": "Great Clips", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
@@ -2530,6 +2545,7 @@
     "shop/paint/Comex": {"name": "Comex", "icon": "fas-paint-roller", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "paint", "brand:wikidata": "Q5151654"}, "addTags": {"brand": "Comex", "brand:wikidata": "Q5151654", "brand:wikipedia": "en:Comex Group", "name": "Comex", "shop": "paint"}, "removeTags": {"brand": "Comex", "brand:wikidata": "Q5151654", "brand:wikipedia": "en:Comex Group", "name": "Comex", "shop": "paint"}, "matchScore": 2, "suggestion": true},
     "shop/paint/Jotun": {"name": "Jotun", "icon": "fas-paint-roller", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "paint", "brand:wikidata": "Q1778870"}, "addTags": {"brand": "Jotun", "brand:wikidata": "Q1778870", "brand:wikipedia": "en:Jotun (company)", "name": "Jotun", "shop": "paint"}, "removeTags": {"brand": "Jotun", "brand:wikidata": "Q1778870", "brand:wikipedia": "en:Jotun (company)", "name": "Jotun", "shop": "paint"}, "matchScore": 2, "suggestion": true},
     "shop/paint/Sherwin Williams": {"name": "Sherwin Williams", "icon": "fas-paint-roller", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "paint", "brand:wikidata": "Q48881"}, "addTags": {"brand": "Sherwin Williams", "brand:wikidata": "Q48881", "brand:wikipedia": "en:Sherwin-Williams", "name": "Sherwin Williams", "shop": "paint"}, "removeTags": {"brand": "Sherwin Williams", "brand:wikidata": "Q48881", "brand:wikipedia": "en:Sherwin-Williams", "name": "Sherwin Williams", "shop": "paint"}, "matchScore": 2, "suggestion": true},
+    "shop/party/Party City": {"name": "Party City", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "party", "brand:wikidata": "Q7140896"}, "addTags": {"brand": "Party City", "brand:wikidata": "Q7140896", "brand:wikipedia": "en:Party City", "name": "Party City", "shop": "party"}, "removeTags": {"brand": "Party City", "brand:wikidata": "Q7140896", "brand:wikipedia": "en:Party City", "name": "Party City", "shop": "party"}, "matchScore": 2, "suggestion": true},
     "shop/pawnbroker/Cash Converters": {"name": "Cash Converters", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "pawnbroker", "brand:wikidata": "Q5048645"}, "addTags": {"brand": "Cash Converters", "brand:wikidata": "Q5048645", "brand:wikipedia": "en:Cash Converters", "name": "Cash Converters", "shop": "pawnbroker"}, "removeTags": {"brand": "Cash Converters", "brand:wikidata": "Q5048645", "brand:wikipedia": "en:Cash Converters", "name": "Cash Converters", "shop": "pawnbroker"}, "matchScore": 2, "suggestion": true},
     "shop/pawnbroker/Cebuana Lhuillier": {"name": "Cebuana Lhuillier", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "pawnbroker", "brand:wikidata": "Q17064661"}, "addTags": {"brand": "Cebuana Lhuillier", "brand:wikidata": "Q17064661", "brand:wikipedia": "en:Cebuana Lhuillier", "name": "Cebuana Lhuillier", "shop": "pawnbroker"}, "removeTags": {"brand": "Cebuana Lhuillier", "brand:wikidata": "Q17064661", "brand:wikipedia": "en:Cebuana Lhuillier", "name": "Cebuana Lhuillier", "shop": "pawnbroker"}, "matchScore": 2, "suggestion": true},
     "shop/perfumery/Douglas": {"name": "Douglas", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "perfumery", "brand:wikidata": "Q2052213"}, "addTags": {"brand": "Douglas", "brand:wikidata": "Q2052213", "brand:wikipedia": "de:Parfümerie Douglas", "name": "Douglas", "shop": "perfumery"}, "removeTags": {"brand": "Douglas", "brand:wikidata": "Q2052213", "brand:wikipedia": "de:Parfümerie Douglas", "name": "Douglas", "shop": "perfumery"}, "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/amenity/money_transfer.json b/data/presets/presets/amenity/money_transfer.json
new file mode 100644
index 000000000..d1405ee02
--- /dev/null
+++ b/data/presets/presets/amenity/money_transfer.json
@@ -0,0 +1,31 @@
+{
+    "icon": "maki-bank",
+    "fields": [
+	    "name",
+        "brand",
+        "address",
+        "building_area",
+        "opening_hours",
+        "currency_multi"
+    ],
+    "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"
+}
diff --git a/data/presets/presets/amenity/payment_centre.json b/data/presets/presets/amenity/payment_centre.json
new file mode 100644
index 000000000..a2e0bb4f2
--- /dev/null
+++ b/data/presets/presets/amenity/payment_centre.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-bank",
+    "fields": [
+	    "name",
+        "brand",
+        "address",
+        "building_area",
+        "opening_hours",
+        "payment_multi"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "check",
+        "tax pay",
+        "bill pay",
+        "currency",
+        "finance",
+        "cash",
+        "money"
+    ],
+    "tags": {
+        "amenity": "payment_centre"
+    },
+    "name": "Payment Center"
+}
diff --git a/data/presets/presets/amenity/payment_terminal.json b/data/presets/presets/amenity/payment_terminal.json
new file mode 100644
index 000000000..e85228256
--- /dev/null
+++ b/data/presets/presets/amenity/payment_terminal.json
@@ -0,0 +1,29 @@
+{
+    "icon": "maki-bank",
+    "fields": [
+	    "name",
+        "brand",
+        "address",
+        "opening_hours",
+        "payment_multi"
+    ],
+    "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"
+}
diff --git a/data/presets/presets/shop/catalogue.json b/data/presets/presets/shop/catalogue.json
new file mode 100644
index 000000000..7cc9e70ce
--- /dev/null
+++ b/data/presets/presets/shop/catalogue.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-shop",
+    "fields": [
+        "name",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "payment_multi"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "catalogue"
+    },
+    "name": "Catalog Shop"
+}
diff --git a/data/presets/presets/shop/country_store.json b/data/presets/presets/shop/country_store.json
new file mode 100644
index 000000000..4c4f033af
--- /dev/null
+++ b/data/presets/presets/shop/country_store.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-shop",
+    "fields": [
+        "name",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "payment_multi"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "country_store"
+    },
+    "name": "Country Store"
+}
diff --git a/data/presets/presets/shop/hairdresser_supply.json b/data/presets/presets/shop/hairdresser_supply.json
new file mode 100644
index 000000000..8a3a04538
--- /dev/null
+++ b/data/presets/presets/shop/hairdresser_supply.json
@@ -0,0 +1,24 @@
+{
+    "icon": "maki-shop",
+    "fields": [
+        "name",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "payment_multi"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "barber",
+        "shampoo",
+        "conditioner"
+    ],
+    "tags": {
+        "shop": "hairdresser_supply"
+    },
+    "name": "Hairdresser Supply Store"
+}
diff --git a/data/presets/presets/shop/party.json b/data/presets/presets/shop/party.json
new file mode 100644
index 000000000..ddab82f4d
--- /dev/null
+++ b/data/presets/presets/shop/party.json
@@ -0,0 +1,25 @@
+{
+    "icon": "maki-shop",
+    "fields": [
+        "name",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours",
+        "payment_multi"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "balloons",
+        "costumes",
+        "decorations",
+        "invitations"
+    ],
+    "tags": {
+        "shop": "party"
+    },
+    "name": "Party Supply Store"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 96dc57fc7..66c0a6ba4 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -721,6 +721,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"
     },
+    {
+      "key": "amenity",
+      "value": "money_transfer",
+      "description": "Money Transfer Station",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"
+    },
     {
       "key": "amenity",
       "value": "motorcycle_parking",
@@ -769,6 +776,20 @@
       "object_types": ["area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"
     },
+    {
+      "key": "amenity",
+      "value": "payment_centre",
+      "description": "Payment Center",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"
+    },
+    {
+      "key": "amenity",
+      "value": "payment_terminal",
+      "description": "Payment Terminal",
+      "object_types": ["node"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"
+    },
     {
       "key": "amenity",
       "value": "pharmacy",
@@ -5484,6 +5505,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
     },
+    {
+      "key": "shop",
+      "value": "catalogue",
+      "description": "Catalog Shop",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
+    },
     {
       "key": "shop",
       "value": "charity",
@@ -5561,6 +5589,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
     },
+    {
+      "key": "shop",
+      "value": "country_store",
+      "description": "Country Store",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
+    },
     {
       "key": "shop",
       "value": "craft",
@@ -5708,6 +5743,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
     },
+    {
+      "key": "shop",
+      "value": "hairdresser_supply",
+      "description": "Hairdresser Supply Store",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
+    },
     {
       "key": "shop",
       "value": "hairdresser",
@@ -5918,6 +5960,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-paint-roller.svg?sanitize=true"
     },
+    {
+      "key": "shop",
+      "value": "party",
+      "description": "Party Supply Store",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"
+    },
     {
       "key": "shop",
       "value": "pastry",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7e95240b7..46f82733d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3604,6 +3604,10 @@
                     "name": "Monastery Grounds",
                     "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"
                 },
+                "amenity/money_transfer": {
+                    "name": "Money Transfer Station",
+                    "terms": "money order,check,bill,currency,finance,wire transfer,cable,person to person,cash to cash,exchange"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Motorcycle Parking",
                     "terms": ""
@@ -3632,6 +3636,14 @@
                     "name": "Multilevel Parking Garage",
                     "terms": "car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure"
                 },
+                "amenity/payment_centre": {
+                    "name": "Payment Center",
+                    "terms": "check,tax pay,bill pay,currency,finance,cash,money"
+                },
+                "amenity/payment_terminal": {
+                    "name": "Payment Terminal",
+                    "terms": "interactive kiosk,ekiosk,atm,bill pay,tax pay,phone pay,finance,cash,money transfer,card"
+                },
                 "amenity/pharmacy": {
                     "name": "Pharmacy",
                     "terms": "apothecary,drug*,med*,prescription"
@@ -6564,6 +6576,10 @@
                     "name": "Carpet Store",
                     "terms": "rug"
                 },
+                "shop/catalogue": {
+                    "name": "Catalog Shop",
+                    "terms": ""
+                },
                 "shop/charity": {
                     "name": "Charity Store",
                     "terms": "thrift,op shop,nonprofit"
@@ -6608,6 +6624,10 @@
                     "name": "Cosmetics Store",
                     "terms": ""
                 },
+                "shop/country_store": {
+                    "name": "Country Store",
+                    "terms": ""
+                },
                 "shop/craft": {
                     "name": "Arts and Crafts Store",
                     "terms": "art*,paint*,frame"
@@ -6692,6 +6712,10 @@
                     "name": "Greengrocer",
                     "terms": "fruit,vegetable"
                 },
+                "shop/hairdresser_supply": {
+                    "name": "Hairdresser Supply Store",
+                    "terms": "barber,shampoo,conditioner"
+                },
                 "shop/hairdresser": {
                     "name": "Hairdresser",
                     "terms": "barber"
@@ -6812,6 +6836,10 @@
                     "name": "Paint Store",
                     "terms": ""
                 },
+                "shop/party": {
+                    "name": "Party Supply Store",
+                    "terms": "balloons,costumes,decorations,invitations"
+                },
                 "shop/pastry": {
                     "name": "Pastry Shop",
                     "terms": "patisserie,cake shop,cakery"