diff --git a/data/presets/amenity/fast_food/sandwich.json b/data/presets/amenity/fast_food/sandwich.json
index ab467cf91..6a8a4bde7 100644
--- a/data/presets/amenity/fast_food/sandwich.json
+++ b/data/presets/amenity/fast_food/sandwich.json
@@ -8,6 +8,8 @@
         "breakfast",
         "cafe",
         "café",
+        "deli",
+        "deli sandwich",
         "dine",
         "dining",
         "dinner",
@@ -15,6 +17,7 @@
         "eat",
         "grill",
         "lunch",
+        "meat",
         "table"
     ],
     "tags": {
diff --git a/data/presets/shop/antiques.json b/data/presets/shop/antiques.json
index b8682ca1e..41988ad76 100644
--- a/data/presets/shop/antiques.json
+++ b/data/presets/shop/antiques.json
@@ -7,5 +7,10 @@
     "tags": {
         "shop": "antiques"
     },
-    "name": "Antiques Shop"
+    "name": "Antique Shop",
+    "aliases": [
+        "Antique Store",
+        "Antiques Shop",
+        "Antiques Store"
+    ]
 }
diff --git a/data/presets/shop/bookmaker.json b/data/presets/shop/bookmaker.json
index 7b0541399..fe79bae46 100644
--- a/data/presets/shop/bookmaker.json
+++ b/data/presets/shop/bookmaker.json
@@ -13,10 +13,12 @@
     },
     "terms": [
         "betting",
-        "bookie",
         "gamble",
-        "gambling",
-        "turf accountant"
+        "gambling"
     ],
-    "name": "Bookmaker"
+    "name": "Bookmaker",
+    "aliases": [
+        "Bookie",
+        "Turf Accountant"
+    ]
 }
diff --git a/data/presets/shop/books.json b/data/presets/shop/books.json
index 48d51ec77..36453f59b 100644
--- a/data/presets/shop/books.json
+++ b/data/presets/shop/books.json
@@ -16,5 +16,12 @@
     "tags": {
         "shop": "books"
     },
-    "name": "Book Store"
+    "name": "Bookstore",
+    "aliases": [
+        "Bookshop",
+        "Bookseller",
+        "Book Store",
+        "Book Shop",
+        "Book Seller"
+    ]
 }
diff --git a/data/presets/shop/butcher.json b/data/presets/shop/butcher.json
index de2e3f437..98ca0bf55 100644
--- a/data/presets/shop/butcher.json
+++ b/data/presets/shop/butcher.json
@@ -14,5 +14,10 @@
     "tags": {
         "shop": "butcher"
     },
-    "name": "Butcher"
+    "name": "Butcher",
+    "aliases": [
+        "Butcher Shop",
+        "Pork Store",
+        "Butchery"
+    ]
 }
diff --git a/data/presets/shop/car.json b/data/presets/shop/car.json
index 32a504b6e..514d9a47f 100644
--- a/data/presets/shop/car.json
+++ b/data/presets/shop/car.json
@@ -18,5 +18,8 @@
     "tags": {
         "shop": "car"
     },
-    "name": "Car Dealership"
+    "name": "Car Dealership",
+    "aliases": [
+        "Car Dealer"
+    ]
 }
diff --git a/data/presets/shop/car_repair.json b/data/presets/shop/car_repair.json
index f6225dfd7..a835b0547 100644
--- a/data/presets/shop/car_repair.json
+++ b/data/presets/shop/car_repair.json
@@ -9,17 +9,21 @@
         "area"
     ],
     "terms": [
-        "auto mechanic",
         "automechanic",
-        "automobile",
         "automotive",
         "garage",
         "inspection",
+        "mechanic",
         "oil change",
         "service"
     ],
     "tags": {
         "shop": "car_repair"
     },
-    "name": "Car Repair Shop"
+    "name": "Car Repair Shop",
+    "aliases": [
+        "Automobile Repair Shop",
+        "Car Mechanic",
+        "Auto Mechanic"
+    ]
 }
diff --git a/data/presets/shop/clothes/underwear.json b/data/presets/shop/clothes/underwear.json
index 4eea770a5..57c70e968 100644
--- a/data/presets/shop/clothes/underwear.json
+++ b/data/presets/shop/clothes/underwear.json
@@ -18,6 +18,7 @@
         "brassieres",
         "briefs",
         "boxers",
+        "dessous",
         "fashion",
         "lingerie",
         "panties",
diff --git a/data/presets/shop/confectionery.json b/data/presets/shop/confectionery.json
index cd6477220..755ee14d8 100644
--- a/data/presets/shop/confectionery.json
+++ b/data/presets/shop/confectionery.json
@@ -5,10 +5,17 @@
         "area"
     ],
     "terms": [
+        "fudge",
+        "lollipop",
+        "sugar",
         "sweet"
     ],
     "tags": {
         "shop": "confectionery"
     },
-    "name": "Candy Store"
+    "name": "Candy Store",
+    "aliases": [
+        "Candy Shop",
+        "Confectionery Store"
+    ]
 }
diff --git a/data/presets/shop/convenience.json b/data/presets/shop/convenience.json
index bb77986b1..1e47e445e 100644
--- a/data/presets/shop/convenience.json
+++ b/data/presets/shop/convenience.json
@@ -11,5 +11,16 @@
     "tags": {
         "shop": "convenience"
     },
-    "name": "Convenience Store"
+    "terms": [
+        "mini-mart",
+        "mini-market"
+    ],
+    "name": "Convenience Store",
+    "aliases": [
+        "Convenience Shop",
+        "Corner Store",
+        "Corner Shop",
+        "Superette",
+        "Bodega"
+    ]
 }
diff --git a/data/presets/shop/copyshop.json b/data/presets/shop/copyshop.json
index 79f60f8d9..bda5ddca8 100644
--- a/data/presets/shop/copyshop.json
+++ b/data/presets/shop/copyshop.json
@@ -11,5 +11,8 @@
         "print",
         "scan"
     ],
-    "name": "Copy Store"
+    "name": "Copy Store",
+    "aliases": [
+        "Copy Shop"
+    ]
 }
diff --git a/data/presets/shop/country_store.json b/data/presets/shop/country_store.json
index e4701b490..ce4bb8464 100644
--- a/data/presets/shop/country_store.json
+++ b/data/presets/shop/country_store.json
@@ -7,5 +7,8 @@
     "tags": {
         "shop": "country_store"
     },
-    "name": "Country Store"
+    "name": "Rural Supplies Store",
+    "aliases": [
+        "Country Store"
+    ]
 }
diff --git a/data/presets/shop/deli.json b/data/presets/shop/deli.json
index 2db092053..a10de92d3 100644
--- a/data/presets/shop/deli.json
+++ b/data/presets/shop/deli.json
@@ -1,16 +1,20 @@
 {
-    "icon": "temaki-meat",
+    "icon": "fas-jar",
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "lunch",
-        "meat",
-        "sandwich"
+        "deli"
     ],
     "tags": {
         "shop": "deli"
     },
-    "name": "Deli"
+    "name": "Delicatessen",
+    "aliases": [
+        "Specialty Food Store",
+        "Gourmet Food Store",
+        "Fine Food Store",
+        "Gourmet Food Shop"
+    ]
 }
diff --git a/data/presets/shop/funeral_directors.json b/data/presets/shop/funeral_directors.json
index 44cb64dc4..ae88ef135 100644
--- a/data/presets/shop/funeral_directors.json
+++ b/data/presets/shop/funeral_directors.json
@@ -11,10 +11,14 @@
     ],
     "terms": [
         "undertaker",
-        "memorial home"
+        "memorial home",
+        "mortuary"
     ],
     "tags": {
         "shop": "funeral_directors"
     },
-    "name": "Funeral Home"
+    "name": "Funeral Home",
+    "aliases": [
+        "Funeral Parlor"
+    ]
 }
diff --git a/data/presets/shop/games.json b/data/presets/shop/games.json
index 15a74a5f2..b0b6b2817 100644
--- a/data/presets/shop/games.json
+++ b/data/presets/shop/games.json
@@ -12,9 +12,12 @@
         "card game",
         "dice game",
         "game shop",
+        "larp",
         "live action role-playing game",
-        "miniatures wargame",
-        "strategy game"
+        "miniature wargame",
+        "role-playing",
+        "strategy game",
+        "wargame"
     ],
     "name": "Tabletop Game Store"
 }
diff --git a/data/presets/shop/garden_centre.json b/data/presets/shop/garden_centre.json
index edd4817f8..dfb2616e7 100644
--- a/data/presets/shop/garden_centre.json
+++ b/data/presets/shop/garden_centre.json
@@ -7,6 +7,9 @@
     "terms": [
         "landscape",
         "mulch",
+        "nursery",
+        "plant nursery",
+        "retail plant nursery",
         "shrub",
         "tree"
     ],
diff --git a/data/presets/shop/general.json b/data/presets/shop/general.json
index 293b1e78f..325a6da6c 100644
--- a/data/presets/shop/general.json
+++ b/data/presets/shop/general.json
@@ -8,7 +8,13 @@
         "shop": "general"
     },
     "terms": [
+        "small-town store",
         "village shop"
     ],
-    "name": "General Store"
+    "name": "General Store",
+    "aliases": [
+        "General Merchant Store",
+        "General Merchandise Store",
+        "General Dealer"
+    ]
 }
diff --git a/data/presets/shop/gift.json b/data/presets/shop/gift.json
index d53afbd50..81809a42f 100644
--- a/data/presets/shop/gift.json
+++ b/data/presets/shop/gift.json
@@ -5,10 +5,13 @@
         "area"
     ],
     "terms": [
-        "souvenir"
+        "tourist trap"
     ],
     "tags": {
         "shop": "gift"
     },
-    "name": "Gift Shop"
+    "name": "Gift Shop",
+    "aliases": [
+        "Souvenir Shop"
+    ]
 }
diff --git a/data/presets/shop/greengrocer.json b/data/presets/shop/greengrocer.json
index adcc27c66..eac27802c 100644
--- a/data/presets/shop/greengrocer.json
+++ b/data/presets/shop/greengrocer.json
@@ -16,5 +16,9 @@
     "tags": {
         "shop": "greengrocer"
     },
-    "name": "Greengrocer"
+    "name": "Greengrocer",
+    "aliases": [
+        "Produce Store",
+        "Produce Shop"
+    ]
 }
diff --git a/data/presets/shop/hairdresser.json b/data/presets/shop/hairdresser.json
index e718ce2c6..ba4d3b226 100644
--- a/data/presets/shop/hairdresser.json
+++ b/data/presets/shop/hairdresser.json
@@ -5,10 +5,14 @@
         "area"
     ],
     "terms": [
-        "barber"
+        "beard"
     ],
     "tags": {
         "shop": "hairdresser"
     },
-    "name": "Hairdresser"
+    "name": "Hairdresser",
+    "aliases": [
+        "Hair Salon",
+        "Barber Shop"
+    ]
 }
diff --git a/data/presets/shop/hairdresser_supply.json b/data/presets/shop/hairdresser_supply.json
index 3b16dab80..a2d8c1d3b 100644
--- a/data/presets/shop/hairdresser_supply.json
+++ b/data/presets/shop/hairdresser_supply.json
@@ -6,7 +6,9 @@
     ],
     "terms": [
         "barber",
+        "razor",
         "shampoo",
+        "shaver",
         "conditioner"
     ],
     "tags": {
diff --git a/data/presets/shop/hardware.json b/data/presets/shop/hardware.json
index cd210fe62..2d90b2643 100644
--- a/data/presets/shop/hardware.json
+++ b/data/presets/shop/hardware.json
@@ -15,5 +15,8 @@
         "home improvement",
         "tools"
     ],
-    "name": "Hardware Store"
+    "name": "Hardware Store",
+    "aliases": [
+        "Hardware Shop"
+    ]
 }
diff --git a/data/presets/shop/health_food.json b/data/presets/shop/health_food.json
index 762ac75eb..87ba6766a 100644
--- a/data/presets/shop/health_food.json
+++ b/data/presets/shop/health_food.json
@@ -5,13 +5,21 @@
         "area"
     ],
     "terms": [
-        "wholefood",
-        "vitamins",
+        "groceries",
+        "nutritional",
+        "organic",
+        "raw food",
+        "unprocessed",
         "vegetarian",
-        "vegan"
+        "vegan",
+        "vitamins",
+        "wholefood"
     ],
     "tags": {
         "shop": "health_food"
     },
-    "name": "Health Food Shop"
+    "name": "Health Food Store",
+    "aliases": [
+        "Health Food Shop"
+    ]
 }
diff --git a/data/presets/shop/herbalist.json b/data/presets/shop/herbalist.json
index 49f1b0407..1e64f28a5 100644
--- a/data/presets/shop/herbalist.json
+++ b/data/presets/shop/herbalist.json
@@ -7,5 +7,14 @@
     "tags": {
         "shop": "herbalist"
     },
+    "terms": [
+        "ayurveda",
+        "ayurvedic",
+        "medicinal plants",
+        "paraherbal",
+        "phytomedicine",
+        "plant medicine",
+        "traditional medicine"
+    ],
     "name": "Herbalist"
 }
diff --git a/data/presets/shop/houseware.json b/data/presets/shop/houseware.json
index 487153cd7..f17b3293d 100644
--- a/data/presets/shop/houseware.json
+++ b/data/presets/shop/houseware.json
@@ -6,11 +6,13 @@
     ],
     "terms": [
         "home",
-        "household",
         "kitchenware"
     ],
     "tags": {
         "shop": "houseware"
     },
-    "name": "Houseware Store"
+    "name": "Houseware Store",
+    "aliases": [
+        "Household Goods Store"
+    ]
 }
diff --git a/data/presets/shop/jewelry.json b/data/presets/shop/jewelry.json
index e993cd025..8cfd6eb8c 100644
--- a/data/presets/shop/jewelry.json
+++ b/data/presets/shop/jewelry.json
@@ -21,5 +21,8 @@
     "tags": {
         "shop": "jewelry"
     },
-    "name": "Jewelry Store"
+    "name": "Jewelry Store",
+    "aliases": [
+        "Jewelry Shop"
+    ]
 }
diff --git a/data/presets/shop/kiosk.json b/data/presets/shop/kiosk.json
index 6a1437d37..eb0f21213 100644
--- a/data/presets/shop/kiosk.json
+++ b/data/presets/shop/kiosk.json
@@ -7,5 +7,15 @@
     "tags": {
         "shop": "kiosk"
     },
+    "terms": [
+        "beverages",
+        "cigarettes",
+        "mall kiosk",
+        "newsagent",
+        "newspaper",
+        "newsstand",
+        "snacks",
+        "sweets"
+    ],
     "name": "Kiosk"
 }
diff --git a/data/presets/shop/laundry/self_service.json b/data/presets/shop/laundry/self_service.json
index e15727ec8..d396fdf5f 100644
--- a/data/presets/shop/laundry/self_service.json
+++ b/data/presets/shop/laundry/self_service.json
@@ -8,12 +8,12 @@
         "shop": "laundry",
         "self_service": "yes"
     },
-    "terms": [
+    "name": "Self-Service Laundry",
+    "aliases": [
         "Coin Laundry",
         "Laundromat",
         "Coin Wash",
         "Launderette",
         "Washateria"
-    ],
-    "name": "Self-Service Laundry"
+    ]
 }
diff --git a/data/presets/shop/mall.json b/data/presets/shop/mall.json
index ed943cf75..00b43c07d 100644
--- a/data/presets/shop/mall.json
+++ b/data/presets/shop/mall.json
@@ -10,5 +10,9 @@
     "tags": {
         "shop": "mall"
     },
-    "name": "Mall"
+    "name": "Mall",
+    "aliases": [
+        "Shopping Mall",
+        "Shopping Center"
+    ]
 }
diff --git a/data/presets/shop/model.json b/data/presets/shop/model.json
index f27b3e060..9e2f3c001 100644
--- a/data/presets/shop/model.json
+++ b/data/presets/shop/model.json
@@ -12,7 +12,9 @@
         "model building",
         "model figures",
         "model kits",
+        "model railroading",
         "model store",
+        "rail transport modelling",
         "scale models"
     ],
     "name": "Model Shop"
diff --git a/data/presets/shop/money_lender.json b/data/presets/shop/money_lender.json
index a5a37dcd9..5510a0035 100644
--- a/data/presets/shop/money_lender.json
+++ b/data/presets/shop/money_lender.json
@@ -11,5 +11,8 @@
     "tags": {
         "shop": "money_lender"
     },
+    "terms": [
+        "payday loan"
+    ],
     "name": "Money Lender"
 }
diff --git a/data/presets/shop/motorcycle_repair.json b/data/presets/shop/motorcycle_repair.json
index 13bb316ad..582c70605 100644
--- a/data/presets/shop/motorcycle_repair.json
+++ b/data/presets/shop/motorcycle_repair.json
@@ -19,5 +19,8 @@
     "tags": {
         "shop": "motorcycle_repair"
     },
-    "name": "Motorcycle Repair Shop"
+    "name": "Motorcycle Repair Shop",
+    "aliases": [
+        "Motorcycle Repair Workshop"
+    ]
 }
diff --git a/data/presets/shop/musical_instrument.json b/data/presets/shop/musical_instrument.json
index 4d99fed34..18c4f9999 100644
--- a/data/presets/shop/musical_instrument.json
+++ b/data/presets/shop/musical_instrument.json
@@ -5,7 +5,18 @@
         "area"
     ],
     "terms": [
-        "guitar"
+        "accordion",
+        "brass instruments",
+        "cello",
+        "clarinet",
+        "drum",
+        "flute",
+        "guitar",
+        "keyboard",
+        "piano",
+        "saxophone",
+        "trumpet",
+        "violin"
     ],
     "tags": {
         "shop": "musical_instrument"
diff --git a/data/presets/shop/newsagent.json b/data/presets/shop/newsagent.json
index 8f7cc57ac..2b0350a4c 100644
--- a/data/presets/shop/newsagent.json
+++ b/data/presets/shop/newsagent.json
@@ -7,5 +7,8 @@
     "tags": {
         "shop": "newsagent"
     },
-    "name": "Newspaper/Magazine Shop"
+    "name": "Newsstand",
+    "aliases": [
+        "Newspaper/Magazine Shop"
+    ]
 }
diff --git a/data/presets/shop/nutrition_supplements.json b/data/presets/shop/nutrition_supplements.json
index 1199da5dd..3b88d0269 100644
--- a/data/presets/shop/nutrition_supplements.json
+++ b/data/presets/shop/nutrition_supplements.json
@@ -6,6 +6,7 @@
     ],
     "terms": [
         "health",
+        "protein",
         "supplement",
         "vitamin"
     ],
diff --git a/data/presets/shop/pawnbroker.json b/data/presets/shop/pawnbroker.json
index 0ce584243..d6a4dcdbb 100644
--- a/data/presets/shop/pawnbroker.json
+++ b/data/presets/shop/pawnbroker.json
@@ -7,5 +7,9 @@
     "tags": {
         "shop": "pawnbroker"
     },
-    "name": "Pawn Shop"
+    "name": "Pawnshop",
+    "aliases": [
+        "Pawnbroker",
+        "Pawn Shop"
+    ]
 }
diff --git a/data/presets/shop/pet.json b/data/presets/shop/pet.json
index 4bf517353..e4acb6d44 100644
--- a/data/presets/shop/pet.json
+++ b/data/presets/shop/pet.json
@@ -16,5 +16,8 @@
     "tags": {
         "shop": "pet"
     },
-    "name": "Pet Store"
+    "name": "Pet Store",
+    "aliases": [
+        "Pet Shop"
+    ]
 }
diff --git a/data/presets/shop/seafood.json b/data/presets/shop/seafood.json
index 421deddfb..f6c7e2171 100644
--- a/data/presets/shop/seafood.json
+++ b/data/presets/shop/seafood.json
@@ -4,8 +4,8 @@
         "point",
         "area"
     ],
-    "terms": [
-        "fishmonger"
+    "aliases": [
+        "Fishmonger"
     ],
     "tags": {
         "shop": "seafood"
diff --git a/data/presets/shop/second_hand.json b/data/presets/shop/second_hand.json
index f814f4e59..b251680a8 100644
--- a/data/presets/shop/second_hand.json
+++ b/data/presets/shop/second_hand.json
@@ -9,14 +9,18 @@
         "area"
     ],
     "terms": [
-        "secondhand",
-        "second hand",
+        "second-hand",
         "resale",
-        "thrift",
         "used"
     ],
     "tags": {
         "shop": "second_hand"
     },
-    "name": "Consignment/Thrift Store"
+    "name": "Thrift Store",
+    "aliases": [
+        "Thrift Shop",
+        "Consignment Store",
+        "Resale Shop",
+        "Secondhand Shop"
+    ]
 }
diff --git a/data/presets/shop/stationery.json b/data/presets/shop/stationery.json
index eba3c3395..28c17a543 100644
--- a/data/presets/shop/stationery.json
+++ b/data/presets/shop/stationery.json
@@ -11,5 +11,8 @@
     "tags": {
         "shop": "stationery"
     },
-    "name": "Stationery Store"
+    "name": "Stationery Store",
+    "aliases": [
+        "Office Supply Store"
+    ]
 }
diff --git a/data/presets/shop/ticket.json b/data/presets/shop/ticket.json
index cd9869d5e..60d2b9cde 100644
--- a/data/presets/shop/ticket.json
+++ b/data/presets/shop/ticket.json
@@ -10,5 +10,9 @@
     "terms": [
         "box office"
     ],
-    "name": "Ticket Seller"
+    "name": "Ticket Seller",
+    "aliases": [
+        "Ticket Vendor",
+        "Ticket Booth"
+    ]
 }
diff --git a/data/presets/shop/toys.json b/data/presets/shop/toys.json
index 5245f92ed..881f94f1d 100644
--- a/data/presets/shop/toys.json
+++ b/data/presets/shop/toys.json
@@ -8,7 +8,8 @@
         "shop": "toys"
     },
     "terms": [
-        "games"
+        "games",
+        "teddy"
     ],
     "name": "Toy Store"
 }
diff --git a/data/presets/shop/variety_store.json b/data/presets/shop/variety_store.json
index b5b4a4ccd..e6a0d24fa 100644
--- a/data/presets/shop/variety_store.json
+++ b/data/presets/shop/variety_store.json
@@ -7,5 +7,13 @@
     "tags": {
         "shop": "variety_store"
     },
-    "name": "Variety Store"
+    "terms": [
+        "five and dime",
+        "five and ten"
+    ],
+    "name": "Discount Store",
+    "aliases": [
+        "Dollar Store",
+        "Variety Store"
+    ]
 }