diff --git a/data/categories.txt b/data/categories.txt
index 9e719bca5f..0259c67773 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -1001,6 +1001,9 @@ uk:4Магазин|Крамниця
 zh-Hans:商店
 zh-Hant:1購物|店鋪|商店|雜貨店|便利商店
 
+shop-cannabis
+en:Cannabis
+
 shop-cosmetics|@shopping
 en:4Cosmetics|4Beauty Care|makeup|U+1F3EC|U+1F3EA
 ru:4Косметика
@@ -9754,6 +9757,46 @@ vi:Nhà kim khí
 zh-Hans:金属制造工
 zh-Hant:鐵工
 
+craft-locksmith
+en:Locksmith
+ar:قفال
+be:Слесар
+bg:Ключар
+ca:Serraller
+cs:Zámečník
+da:Låsesmed
+de:Schlosser
+el:Κλειδαράς
+es:Cerrajero
+et:Lukksepp
+eu:Sarrailagilea
+fa:قفل ساز
+fi:Lukkoseppä
+fr:Serrurier
+he:פורץ מנעולים
+hu:Lakatos
+id:Tukang kunci
+it:Fabbro
+ja:錠前屋
+ko:자물쇠 제조공
+mr:लॉकस्मिथ
+nb:Låsesmed
+nl:Slotenmaker
+pl:Ślusarz
+pt:Serralheiro
+pt-BR:Serralheiro
+ro:Lăcătuș
+ru:Слесарь
+sk:Zámočník
+sv:Låssmed
+sw:Fundi wa kufuli
+th:ช่างกุญแจ
+tr:Çilingir
+uk:Слюсар
+vi:Thợ khóa
+zh-Hans:锁匠
+zh-Hant:鎖匠
+
 craft-painter
 en:Painter
 ar:رسام
@@ -13331,6 +13374,46 @@ zh-Hant:機車行
 fa:فروشگاه موتورسیکلت
 mr:दुचाकी विक्रेता|मोटरसायकलचे दुकान
 
+shop-motorcycle_repair
+en:4Motorcycle Repair
+ar:تصليح الدراجات النارية
+be:Рамонт матацыклаў
+bg:Ремонт на мотоциклети
+ca:Reparació de motos
+cs:Opravy motocyklů
+da:Motorcykel reparation
+de:Motorradwerkstatt
+el:Επισκευή μοτοσυκλετών
+es:Reparación de motos
+et:Mootorrataste remont
+eu:Motoen Konponketa
+fa:تعمیر موتور سیکلت
+fi:Moottoripyörän korjaus
+fr:Réparateur de moto
+he:תיקון אופנועים
+hu:Motorkerékpár javítás
+id:Bengkel Sepeda Motor
+it:Riparazione moto
+ja:オートバイの修理
+ko:오토바이 수리
+mr:मोटरसायकल दुरुस्ती
+nb:Motorsykkel reparasjon
+nl:Motorfiets Reparatie
+pl:Naprawa motocykli
+pt:Oficina de motos
+pt-BR:Oficina de motos
+ro:Reparatie motociclete
+ru:Ремонт мотоциклов
+sk:Oprava motocyklov
+sv:Motorcykel reparation
+sw:Ukarabati wa Pikipiki
+th:ซ่อมรถจักรยานยนต์
+tr:Motosiklet Tamiri
+uk:Ремонт мотоциклів
+vi:Sửa chữa xe máy
+zh-Hans:摩托车维修
+zh-Hant:摩托車維修
+
 shop-newsagent
 en:Newspaper Stand|4newspapers
 ru:Газетный киоск|3газеты
@@ -14816,7 +14899,7 @@ pt-BR:Pista para esportes não motorizados
 ru:Беговая дорожка
 tr:Pist
 uk:Бігова доріжка
-zh-Hans = 賽道
+zh-Hans:賽道
 
 power-plant
 en:Power Plant
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 93e7067f06..749cf2d3a6 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -881,6 +881,7 @@ area:highway|trunk;880;
 deprecated|deprecated;881;x
 entrance;[entrance];;ref;addr:flats;882;
 entrance|main;[entrance=main];;ref;addr:flats;883;
+shop|agrarian;884;
 tourism|artwork;885;
 railway|subway|red;[railway=subway][colour=red];x;name;int_name;886;railway|subway|tunnel
 railway|subway|blue;[railway=subway][colour=blue];x;name;int_name;887;railway|subway|tunnel
@@ -955,6 +956,7 @@ shop|furniture;955;
 craft|winery;956;
 waterway|waterfall;957;
 craft|electronics_repair;958;
+shop|appliance;959;
 amenity|casino;960;
 amenity|brothel;961;
 place|neighbourhood;[place=neighbourhood],[place=quarter];;name;int_name;962;
@@ -1216,9 +1218,9 @@ shop|craft;1217;
 shop|sewing;1218;
 railway|station|subway|warszawa;[railway=station][transport=subway][city=warszawa],[railway=station][station=subway][city=warszawa];;name;int_name;1219;
 railway|subway_entrance|warszawa;[railway=subway_entrance][city=warszawa];;name;int_name;1220;
-deprecated|deprecated;1221;x
-deprecated|deprecated;1222;x
-deprecated|deprecated;1223;x
+shop|bed;1221;
+shop|outpost;1222;
+shop|gas;1223;
 natural|desert;[natural=desert],[natural=sand][desert=erg];;name;int_name;1224;
 natural|water|tunnel;[natural=water][tunnel?];;name;int_name;1225;
 place|square;1226;
@@ -1546,3 +1548,14 @@ railway|subway_entrance|wuhan;[railway=subway_entrance][city=wuhan];;name;int_na
 railway|subway_entrance|yerevan;[railway=subway_entrance][city=yerevan];;name;int_name;1548;
 railway|subway_entrance|yokohama;[railway=subway_entrance][city=yokohama];;name;int_name;1549;
 railway|subway_entrance|bilbao;[railway=subway_entrance][city=bilbao];;name;int_name;1550;
+craft|key_cutter;1551;
+craft|locksmith;1552;
+shop|carpet;1553;
+shop|motorcycle_repair;1554;
+shop|pet_grooming;1555;
+shop|hifi;1556;
+shop|bathroom_furnishing;1557;
+shop|curtain;1558;
+shop|fashion_accessories;1559;
+shop|cannabis;1560;
+shop|herbalist;1561;
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index 68c7e17540..c2b3e44b0f 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -37,8 +37,11 @@ sauna=yes : leisure=sauna
 shop=ice_cream : amenity=ice_cream
 shop=e-cigarette : shop=tobacco
 shop=food : shop=convenience
+shop=general : shop=convenience
 shop=haberdashery : shop=sewing
 shop=money_transfer : amenity=money_transfer
+shop=estate_agent : office=estate_agent
+shop=locksmith : craft=locksmith
 
 ford=boat : highway=ford
 ford=intermittent : highway=ford
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 5b8b6e259b..3eee2d2fe9 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -5874,6 +5874,86 @@
     zh-Hans = 暖通工程师
     zh-Hant = 空調設備
 
+  [type.craft.key_cutter]
+    en = Key Cutting
+    ar = قطع المفاتيح
+    be = Выраб ключоў
+    bg = Рязане на ключове
+    ca = Tall de claus
+    cs = Řezání klíčů
+    da = Nøgleskæring
+    de = Schlüssel-Nachmachdienst
+    el = Κοπή κλειδιού
+    es = Copista de llaves
+    et = Võtme lõikamine
+    eu = Giltza-mozketa
+    fa = برش کلید
+    fi = Avaimen leikkaaminen
+    fr = Reproduction de clé
+    he = חיתוך מפתח
+    hu = Kulcsvágás
+    id = Pemotongan Kunci
+    it = Taglio chiave
+    ja = キーカット
+    ko = 키 커팅
+    mr = की कटिंग
+    nb = Key Cutting
+    nl = Sleutel snijden
+    pl = Cięcie kluczy
+    pt = Chaveiro
+    pt-BR = Chaveiro
+    ro = Tăierea cheilor
+    ru = Изготовление ключей
+    sk = Rezanie kľúčov
+    sv = Nyckelklippning
+    sw = Kukata Muhimu
+    th = ตัดกุญแจ
+    tr = Anahtar kesme
+    uk = Нарізка ключів
+    vi = Cắt chính
+    zh-Hans = 钥匙切割
+    zh-Hant = 鍵切割
+
+  [type.craft.locksmith]
+    en = Locksmith
+    ar = قفال
+    be = Слесар
+    bg = Ключар
+    ca = Serraller
+    cs = Zámečník
+    da = Låsesmed
+    de = Schlosser
+    el = Κλειδαράς
+    es = Cerrajero
+    et = Lukksepp
+    eu = Sarrailagilea
+    fa = قفل ساز
+    fi = Lukkoseppä
+    fr = Serrurier
+    he = פורץ מנעולים
+    hu = Lakatos
+    id = Tukang kunci
+    it = Fabbro
+    ja = 錠前屋
+    ko = 자물쇠 제조공
+    mr = लॉकस्मिथ
+    nb = Låsesmed
+    nl = Slotenmaker
+    pl = Ślusarz
+    pt = Serralheiro
+    pt-BR = Serralheiro
+    ro = Lăcătuș
+    ru = Слесарь
+    sk = Zámočník
+    sv = Låssmed
+    sw = Fundi wa kufuli
+    th = ช่างกุญแจ
+    tr = Çilingir
+    uk = Слюсар
+    vi = Thợ khóa
+    zh-Hans = 锁匠
+    zh-Hant = 鎖匠
+
   [type.craft.metal_construction]
     en = Metal Worker
     ar = عامل معادن
@@ -19962,6 +20042,46 @@
     zh-Hans = 烘培店
     zh-Hant = 麵包店
 
+  [type.shop.bathroom_furnishing]
+    en = Bathroom Furnishings
+    ar = أثاث الحمام
+    be = Мэбля для ванных пакояў
+    bg = Обзавеждане за баня
+    ca = Mobles de bany
+    cs = Vybavení koupelny
+    da = Badeværelsesindretning
+    de = Badezimmerausstattung
+    el = Έπιπλα μπάνιου
+    es = Equipamiento de baño
+    et = Vannitoa sisustus
+    eu = Bainugelako altzariak
+    fa = مبلمان حمام
+    fi = Kylpyhuoneen kalusteet
+    fr = Mobilier de salle de bain
+    he = ריהוט חדר רחצה
+    hu = Fürdőszoba berendezési tárgyak
+    id = Perabot Kamar Mandi
+    it = Arredo Bagno
+    ja = バスルームの備品
+    ko = 욕실 가구
+    mr = स्नानगृह सामान
+    nb = Baderomsmøbler
+    nl = Badkamerinrichting
+    pl = Meble łazienkowe
+    pt = Loja de móveis de casa de banho
+    pt-BR = Loja de móveis de banheiro
+    ro = Mobilier pentru baie
+    ru = Мебель для ванной
+    sk = Vybavenie kúpeľne
+    sv = Badrumsinredning
+    sw = Vyombo vya Bafuni
+    th = ตกแต่งห้องน้ำ
+    tr = Banyo Mobilyaları
+    uk = Меблі для ванної кімнати
+    vi = Nội thất phòng tắm
+    zh-Hans = 卫浴摆设
+    zh-Hant = 衛浴擺設
+
   [type.shop.beauty]
     en = Beauty Shop
     ar = صالون تجميل
@@ -20168,6 +20288,46 @@
     zh-Hans = 肉商
     zh-Hant = 肉商
 
+  [type.shop.cannabis]
+    en = Cannabis Store
+    ar = متجر القنب
+    be = Крама канабіса
+    bg = Магазин за канабис
+    ca = Botiga de cànnabis
+    cs = Obchod s konopím
+    da = Cannabis butik
+    de = Cannabis-Laden
+    el = Κατάστημα κάνναβης
+    es = Tienda de cánnabis
+    et = Kanepipood
+    eu = Cannabis denda
+    fa = فروشگاه شاهدانه
+    fi = Kannabiskauppa
+    fr = Magasin de cannabis
+    he = חנות קנאביס
+    hu = Cannabis Store
+    id = Toko ganja
+    it = Negozio di cannabis
+    ja = 大麻店
+    ko = 대마초 판매점
+    mr = गांजाचे दुकान
+    nb = Cannabisbutikk
+    nl = Cannabis Winkel
+    pl = Sklep z konopiami indyjskimi
+    pt = Loja de canábis
+    pt-BR = Loja de cannabis
+    ro = Magazin de canabis
+    ru = Магазин каннабиса
+    sk = Obchod s kanabisom
+    sv = Cannabisbutik
+    sw = Duka la Bangi
+    th = ร้านขายกัญชา
+    tr = Kenevir dükkanı
+    uk = Магазин конопель
+    vi = Cửa hàng cần sa
+    zh-Hans = 大麻商店
+    zh-Hant = 大麻商店
+
   [type.shop.car]
     en = Car Dealership
     ar = متجر سيارات
@@ -20320,6 +20480,46 @@
     tr = Karavan Bayiliği
     uk = Продаж автобудинків
 
+  [type.shop.carpet]
+    en = Carpets
+    ar = السجاد
+    be = Дываны
+    bg = Килими
+    ca = Catifes
+    cs = Koberce
+    da = Tæpper
+    de = Teppichgeschäft
+    el = Χαλιά
+    es = Alfombras
+    et = Vaibad
+    eu = Alfonbrak
+    fa = فرش
+    fi = Matot
+    fr = Magasin de tapis
+    he = שטיחים
+    hu = Szőnyegek
+    id = Karpet
+    it = Tappeti
+    ja = カーペット
+    ko = 카펫
+    mr = कार्पेट्स
+    nb = Tepper
+    nl = Tapijten
+    pl = Dywany
+    pt = Loja de tapetes
+    pt-BR = Loja de tapetes
+    ro = Covoare
+    ru = Ковры
+    sk = Koberce
+    sv = Mattor
+    sw = Mazulia
+    th = พรม
+    tr = Halılar
+    uk = Килими
+    vi = Những cái thảm
+    zh-Hans = 地毯
+    zh-Hant = 地毯
+
   [type.shop.chemist]
     en = Chemist Shop
     ar = متجر كيماويات
@@ -20637,6 +20837,46 @@
     zh-Hans = 化妝品店
     zh-Hant = 化妆品
 
+  [type.shop.curtain]
+    en = Curtains
+    ar = ستائر
+    be = Шторы
+    bg = Пердета
+    ca = Cortines
+    cs = Závěsy
+    da = Gardiner
+    de = Gardinengeschäft
+    el = Κουρτίνες
+    es = Cortinas
+    et = Kardinad
+    eu = Gortinak
+    fa = پرده ها
+    fi = Verhot
+    fr = Magasin de rideaux
+    he = וילונות
+    hu = Függönyök
+    id = Tirai
+    it = Tende
+    ja = カーテン
+    ko = 커튼
+    mr = पडदे
+    nb = Gardiner
+    nl = Gordijnen
+    pl = Zasłony
+    pt = Loja de cortinas
+    pt-BR = Loja de cortinas
+    ro = Perdele
+    ru = Шторы
+    sk = Záclony
+    sv = Gardiner
+    sw = Mapazia
+    th = ผ้าม่าน
+    tr = Perdeler
+    uk = Штори
+    vi = Rèm cửa
+    zh-Hans = 窗帘
+    zh-Hant = 窗簾
+
   [type.shop.deli]
     en = Delicatessen Shop
     ar = ﺔﺒﻠﻌﻤﻟﺍ ﺔﻤﻌﻃﻷﺍ ﻊﻴﺒﻟ ﻞﺤﻣ
@@ -20922,6 +21162,46 @@
     zh-Hans = 农场食品店
     zh-Hant = 農場食品店
 
+  [type.shop.fashion_accessories]
+    en = Fashion Accessories
+    ar = اكسسوارات الموضة
+    be = Модныя аксэсуары
+    bg = Модни аксесоари
+    ca = Complements de moda
+    cs = Módní doplňky
+    da = Mode tilbehør
+    de = Mode-Accessoires
+    el = Αξεσουάρ μόδας
+    es = Accesorios de moda
+    et = Moodsad aksessuaarid
+    eu = Moda Osagarriak
+    fa = لوازم جانبی مد
+    fi = Muoti tarvikkeet
+    fr = Boutique d'accessoires de mode
+    he = אביזרי אופנה
+    hu = Divat kiegészítők
+    id = Aksesoris Fashion
+    it = Accessori alla moda
+    ja = ファッションアクセサリー
+    ko = 패션 악세사리
+    mr = फॅशन अॅक्सेसरीज
+    nb = Motetilbehør
+    nl = Mode accessoires
+    pl = Akcesoria modowe
+    pt = Loja de acessórios de moda
+    pt-BR = Loja de acessórios de moda
+    ro = Acesorii de modă
+    ru = Модные аксессуары
+    sk = Módne doplnky
+    sv = Modeaccessoarer
+    sw = Vifaa vya Mtindo
+    th = เครื่องประดับแฟชั่น
+    tr = Moda Aksesuarları
+    uk = Модні аксесуари
+    vi = Phụ kiện thời trang
+    zh-Hans = 时尚配饰
+    zh-Hant = 時尚配飾
+
   [type.shop.florist]
     en = Florist’s
     ar = متجر زهور
@@ -21063,6 +21343,46 @@
     zh-Hans = 幼儿园
     zh-Hant = 園藝店
 
+  [type.shop.gas]
+    en = Gas Store
+    ar = مخزن غاز
+    be = Газавая крама
+    bg = Магазин за газ
+    ca = Botiga de gas
+    cs = Obchod s plynem
+    da = Gas butik
+    de = Gasspeicher
+    el = Κατάστημα υγραερίου
+    es = Tienda de gasolina
+    et = Gaasipood
+    eu = Gas biltegia
+    fa = فروشگاه گاز
+    fi = Kaasukauppa
+    fr = Vente de gaz
+    he = חנות דלק
+    hu = Gázbolt
+    id = Toko gas
+    it = Deposito di gas
+    ja = ガス屋
+    ko = 주유소
+    mr = गॅसचे दुकान
+    nb = Gassbutikk
+    nl = Gas winkel
+    pl = Sklep gazowy
+    pt = Distribuidora de gás
+    pt-BR = Distribuidora de gás
+    ro = Magazin de gaze
+    ru = Газовый магазин
+    sk = Obchod s plynom
+    sv = Gasaffär
+    sw = Duka la gesi
+    th = ร้านแก๊ส
+    tr = Gaz deposu
+    uk = Газовий магазин
+    vi = Cửa hàng gas
+    zh-Hans = 燃气站
+    zh-Hant = 煤氣庫
+
   [type.shop.gift]
     en = Gift Shop
     ar = متجر هدايا
@@ -21271,6 +21591,86 @@
     zh-Hans = 保健食品店
     zh-Hant = 保健食品店
 
+  [type.shop.herbalist]
+    en = Herbs Store
+    ar = متجر أعشاب
+    be = Магазін траў
+    bg = Магазин за билки
+    ca = Botiga d'herbes
+    cs = Obchod s bylinkami
+    da = Urtebutik
+    de = Kräuterladen
+    el = Κατάστημα με βότανα
+    es = Tienda de hierbas
+    et = Maitsetaimede pood
+    eu = Belar denda
+    fa = فروشگاه گیاهان دارویی
+    fi = Yrttikauppa
+    fr = Herboristerie
+    he = חנות עשבי תיבול
+    hu = Gyógynövény bolt
+    id = Toko jamu
+    it = Negozio di erbe
+    ja = ハーブ店
+    ko = 허브 가게
+    mr = औषधी वनस्पतींचे दुकान
+    nb = Urtebutikk
+    nl = Kruiden winkel
+    pl = Sklep z ziołami
+    pt = Loja de ervas
+    pt-BR = Loja de ervas
+    ro = Magazin de ierburi
+    ru = Магазин трав
+    sk = Obchod s bylinkami
+    sv = Örter butik
+    sw = Duka la mimea
+    th = ร้านสมุนไพร
+    tr = Şifalı bitkiler mağazası
+    uk = Магазин трав
+    vi = Cửa hàng thảo mộc
+    zh-Hans = 草药店
+    zh-Hant = 香草店
+
+  [type.shop.hifi]
+    en = HiFi Audio
+    ar = صوت هاي فاي
+    be = HiFi аўдыё
+    bg = HiFi аудио
+    ca = Àudio HiFi
+    cs = HiFi audio
+    da = HiFi lyd
+    de = HiFi-Audio
+    el = Ήχος HiFi
+    es = Audio de alta fidelidad
+    et = HiFi heli
+    eu = HiFi Audioa
+    fa = صوتی HiFi
+    fi = HiFi Audio
+    fr = Matériel Hi-Fi
+    he = אודיו HiFi
+    hu = HiFi Audio
+    id = Audio HI FI
+    it = Audio ad alta fedeltà
+    ja = ハイファイオーディオ
+    ko = 하이파이 오디오
+    mr = हायफाय ऑडिओ
+    nb = HiFi lyd
+    nl = HiFi-audio
+    pl = Dźwięk Hi-Fi
+    pt = Loja de áudio Hi-Fi
+    pt-BR = Loja de áudio Hi-Fi
+    ro = Audio HiFi
+    ru = Hi-Fi аудио
+    sk = HiFi audio
+    sv = HiFi ljud
+    sw = Sauti ya HiFi
+    th = เครื่องเสียงไฮไฟ
+    tr = HiFi Ses
+    uk = HiFi Audio
+    vi = Âm thanh hifi
+    zh-Hans = HiFi
+    zh-Hant = 高保真音響
+
   [type.shop.houseware]
     ref = type.shop.doityourself
     en = Houseware
@@ -21621,6 +22021,46 @@
     zh-Hans = 摩托车商店
     zh-Hant = 機車行
 
+  [type.shop.motorcycle_repair]
+    en = Motorcycle Repair
+    ar = تصليح الدراجات النارية
+    be = Рамонт матацыклаў
+    bg = Ремонт на мотоциклети
+    ca = Reparació de motos
+    cs = Opravy motocyklů
+    da = Motorcykel reparation
+    de = Motorradwerkstatt
+    el = Επισκευή μοτοσυκλετών
+    es = Reparación de motos
+    et = Mootorrataste remont
+    eu = Motoen Konponketa
+    fa = تعمیر موتور سیکلت
+    fi = Moottoripyörän korjaus
+    fr = Réparateur de moto
+    he = תיקון אופנועים
+    hu = Motorkerékpár javítás
+    id = Bengkel Sepeda Motor
+    it = Riparazione moto
+    ja = オートバイの修理
+    ko = 오토바이 수리
+    mr = मोटरसायकल दुरुस्ती
+    nb = Motorsykkel reparasjon
+    nl = Motorfiets Reparatie
+    pl = Naprawa motocykli
+    pt = Oficina de motos
+    pt-BR = Oficina de motos
+    ro = Reparatie motociclete
+    ru = Ремонт мотоциклов
+    sk = Oprava motocyklov
+    sv = Motorcykel reparation
+    sw = Ukarabati wa Pikipiki
+    th = ซ่อมรถจักรยานยนต์
+    tr = Motosiklet Tamiri
+    uk = Ремонт мотоциклів
+    vi = Sửa chữa xe máy
+    zh-Hans = 摩托车维修
+    zh-Hant = 摩托車維修
+
   [type.shop.music]
     en = Record Store
     ar = متجر
@@ -21798,6 +22238,46 @@
     zh-Hans = 室外设备
     zh-Hant = 室外設備
 
+  [type.shop.outpost]
+    en = Pickup Point
+    ar = نقطة الالتقاط
+    be = Пункт самавывазу
+    bg = Точка на вземане
+    ca = Punt de recollida
+    cs = Místo vyzvednutí
+    da = Afhentningssted
+    de = Abholpunkt
+    el = Σημείο παραλαβής
+    es = Punto de recogida
+    et = Vastuvõtupunkt
+    eu = Jasotzeko puntua
+    fa = نقطه وانت
+    fi = Noutopiste
+    fr = Point de retrait
+    he = נקודת איסוף
+    hu = Felvevő pont
+    id = Titik penjemputan
+    it = Punto di raccolta
+    ja = 集荷場
+    ko = 픽업 장소
+    mr = पिकअप पॉइंट
+    nb = Hentested
+    nl = Ophaalpunt
+    pl = Punkt odbioru
+    pt = Ponto de coleta
+    pt-BR = Ponto de coleta
+    ro = Punct de ridicare
+    ru = Пункт выдачи заказов
+    sk = Miesto odberu
+    sv = Mötesplats
+    sw = Sehemu ya kuchukua
+    th = จุดรับของ
+    tr = Alım noktası
+    uk = Пункт самовивозу
+    vi = Điểm đón
+    zh-Hans = 自提点
+    zh-Hant = 接送的地點
+
   [type.shop.pastry]
     ref = type.shop.bakery
     en = Pastry
@@ -21871,7 +22351,7 @@
     zh-Hant = 當舖
 
   [type.shop.pet]
-    en = Petshop
+    en = Pet Store
     ar = متجر للحيوانات الأليفة
     cs = Zverimex
     da = Dyrehandel
@@ -21905,6 +22385,46 @@
     zh-Hans = 宠物店
     zh-Hant = 寵物店
 
+  [type.shop.pet_grooming]
+    en = Pet Grooming
+    ar = العناية بالحيوانات الأليفة
+    be = Грумінг
+    bg = Грижа за домашни любимци
+    ca = Peluca de mascotes
+    cs = Péče o domácí mazlíčky
+    da = Kæledyrspleje
+    de = Haustierpflege
+    el = Περιποίηση κατοικίδιων ζώων
+    es = Aseo de mascotas
+    et = Lemmikloomade hooldamine
+    eu = Animalien apainketa
+    fa = نظافت حیوانات خانگی
+    fi = Lemmikkieläinten hoito
+    fr = Salon de toilettage
+    he = טיפוח חיות מחמד
+    hu = Kisállat ápolás
+    id = Perawatan Hewan Peliharaan
+    it = Toelettatura per animali domestici
+    ja = ペットグルーミング
+    ko = 애완동물 미용
+    mr = पाळीव प्राणी ग्रूमिंग
+    nb = Kjæledyrpleie
+    nl = Huisdierverzorging
+    pl = Pielęgnacja zwierząt
+    pt = Salão de banhos e tosquia
+    pt-BR = Banho e tosa
+    ro = Îngrijirea animalelor de companie
+    ru = Груминг
+    sk = Starostlivosť o domáce zvieratá
+    sv = Husdjursvård
+    sw = Utunzaji wa Kipenzi
+    th = กรูมมิ่งสัตว์เลี้ยง
+    tr = Evcil Hayvan Bakımı
+    uk = Грумінг
+    vi = Chải lông thú cưng
+    zh-Hans = 宠物美容
+    zh-Hant = 寵物美容
+
   [type.shop.photo]
     en = Photo Shop
     ar = محل صور
@@ -22503,6 +23023,46 @@
     zh-Hans = 酒品商店
     zh-Hant = 販酒處
 
+  [type.shop.agrarian]
+    en = Agricultural Shop
+    ar = محل زراعي
+    be = Сельскагаспадарчы магазін
+    bg = Селскостопански магазин
+    ca = Botiga agrícola
+    cs = Zemědělský obchod
+    da = Landbrugsbutik
+    de = Landwirtschaftliches Geschäft
+    el = Αγροτικό κατάστημα
+    es = Tienda agrícola
+    et = Põllumajanduspood
+    eu = Nekazaritza denda
+    fa = مغازه کشاورزی
+    fi = Maatalouskauppa
+    fr = Magasin d'agriculture
+    he = חנות חקלאית
+    hu = Mezőgazdasági bolt
+    id = Toko pertanian
+    it = Negozio agricolo
+    ja = 農産物直売所
+    ko = 농산물 가게
+    mr = शेतीचे दुकान
+    nb = Landbruksbutikk
+    nl = Agrarische winkel
+    pl = Sklep rolniczy
+    pt = Loja agrícola
+    pt-BR = Loja agrícola
+    ro = Magazin agricol
+    ru = Сельскохозяйственный магазин
+    sk = Poľnohospodársky obchod
+    sv = Lantbruksbutik
+    sw = Duka la kilimo
+    th = ร้านเกษตร
+    tr = Tarım dükkanı
+    uk = Сільськогосподарський магазин
+    vi = Cửa hàng nông sản
+    zh-Hans = 农产品店
+    zh-Hant = 農產品店
+
   [type.shop.antiques]
     en = Antiques
     ar = ﻒﺤﺘﻟﺍ
@@ -22541,6 +23101,46 @@
     zh-Hans = 古董
     zh-Hant = 古董
 
+  [type.shop.appliance]
+    en = Appliances Shop
+    ar = متجر الأجهزة
+    be = Крама бытавой тэхнікі
+    bg = Магазин за техника
+    ca = Botiga d'electrodomèstics
+    cs = Obchod se spotřebiči
+    da = Hvidevarer butik
+    de = Laden für Haushaltsgeräte
+    el = Κατάστημα οικιακών συσκευών
+    es = Tienda de electrodomésticos
+    et = Tehnikapood
+    eu = Etxetresna elektrikoen denda
+    fa = فروشگاه لوازم خانگی
+    fi = Kodinkoneet kauppa
+    fr = Magasin d'électroménager
+    he = חנות מוצרי חשמל
+    hu = Készülék bolt
+    id = Toko peralatan
+    it = Negozio di elettrodomestici
+    ja = 家電店
+    ko = 가전제품 매장
+    mr = उपकरणांचे दुकान
+    nb = Hvitevarebutikk
+    nl = Apparaten winkel
+    pl = Sklep AGD
+    pt = Loja de eletrodomésticos
+    pt-BR = Loja de eletrodomésticos
+    ro = Magazin de electrocasnice
+    ru = Магазин бытовой техники
+    sk = Obchod so spotrebičmi
+    sv = Vitvarubutik
+    sw = Duka la vifaa
+    th = ร้านเครื่องใช้ไฟฟ้า
+    tr = Beyaz eşya dükkanı
+    uk = Магазин побутової техніки
+    vi = Cửa hàng đồ gia dụng
+    zh-Hans = 家电店
+    zh-Hant = 家電店
+
   [type.shop.art]
     en = Arts Shop
     ar = ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ
@@ -22655,6 +23255,46 @@
     zh-Hans = 箱包店
     zh-Hant = 箱包店
 
+  [type.shop.bed]
+    en = Beds Shop
+    ar = متجر الأسرة
+    be = Крама ложкаў
+    bg = Магазин за легла
+    ca = Botiga de llits
+    cs = Prodejna postelí
+    da = Senge butik
+    de = Bettengeschäft
+    el = Κατάστημα κρεβατιών
+    es = Tienda de camas
+    et = Voodipood
+    eu = Ohe denda
+    fa = فروشگاه تخت
+    fi = Sänkykauppa
+    fr = Magasin de literie
+    he = חנות מיטות
+    hu = Ágyak boltja
+    id = Toko tempat tidur
+    it = Negozio di letti
+    ja = ベッドショップ
+    ko = 침대 가게
+    mr = पलंगाचे दुकान
+    nb = Sengebutikk
+    nl = Bedden winkel
+    pl = Sklep z łóżkami
+    pt = Loja de camas
+    pt-BR = Loja de camas
+    ro = Magazin de paturi
+    ru = Магазин кроватей
+    sk = Obchod s posteľami
+    sv = Sängbutik
+    sw = Duka la vitanda
+    th = ร้านขายเตียง
+    tr = Yatak dükkanı
+    uk = Магазин ліжок
+    vi = Cửa hàng giường
+    zh-Hans = 寝具
+    zh-Hant = 床鋪
+
   [type.shop.boutique]
     en = Boutique
     ar = ﺮﺠﺘﻣ