diff --git a/data/presets.yaml b/data/presets.yaml
index c2f965d20..1cb681e7c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3106,6 +3106,11 @@ en:
         name: Cafe
         # 'terms: bistro,coffee,tea'
         terms: '<translate with synonyms or related terms for ''Cafe'', separated by commas>'
+      amenity/cafe/bubble_tea:
+        # 'amenity=cafe, cuisine=bubble_tea'
+        name: Bubble Tea Cafe
+        # 'terms: boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca'
+        terms: '<translate with synonyms or related terms for ''Bubble Tea Cafe'', separated by commas>'
       amenity/cafe/coffee_shop:
         # 'amenity=cafe, cuisine=coffee_shop'
         name: Coffeehouse
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7f80a56af..8a63cf99d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -81,6 +81,7 @@
   "amenity/boat_rental": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "operator/type", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["access_simple", "address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
   "amenity/bureau_de_change": {"icon": "temaki-money_hand", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["email", "fax", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
   "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "bar", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "level", "min_age", "not/name", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+  "amenity/cafe/bubble_tea": {"icon": "temaki-bubble_tea", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "bubble_tea"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": ["boba", "bubble milk tea", "pearl milk tea", "taiwanese tea drink", "tapioca"], "name": "Bubble Tea Cafe"},
   "amenity/cafe/coffee_shop": {"icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "coffee_shop"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": ["americano", "brew", "cafe", "café", "caffe", "caffè", "cappuccino", "cocoa", "coffee shop", "drip", "espresso", "hot drinks", "latte", "macchiato", "tea"], "name": "Coffeehouse"},
   "amenity/car_pooling": {"icon": "temaki-car_pool", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "opening_hours/covid19", "lit"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "terms": ["car sharing", "carpooling", "lift sharing", "ride sharing"], "name": "Car Pooling Station"},
   "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "payment_multi"], "moreFields": ["brand", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
@@ -2094,7 +2095,7 @@
   "amenity/cafe/coffee_shop/85度C": {"name": "85度C", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/85CBakeryCafe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4644852", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "85度C", "brand:en": "85C Bakery Cafe", "brand:wikidata": "Q4644852", "brand:wikipedia": "en:85C Bakery Cafe", "cuisine": "coffee_shop", "name": "85度C", "name:en": "85C Bakery Cafe", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["cn", "tw"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Aroma Espresso Bar": {"name": "Aroma Espresso Bar", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/Israel.Aroma/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2909872", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Aroma Espresso Bar", "brand:wikidata": "Q2909872", "brand:wikipedia": "en:Aroma Espresso Bar", "cuisine": "coffee_shop", "name": "Aroma Espresso Bar", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["ca", "kz", "ro", "ua", "us"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Bakers + Baristas": {"name": "Bakers + Baristas", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/bbsbakersbaristas/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q85199581", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Bakers + Baristas", "brand:wikidata": "Q85199581", "cuisine": "coffee_shop", "name": "Bakers + Baristas", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["gb", "ie"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/Bambu": {"name": "Bambu", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q83437245", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "Bambu", "brand:wikidata": "Q83437245", "cuisine": "vietnamese;bubble_tea", "name": "Bambu", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/Bambu": {"name": "Bambu", "icon": "temaki-bubble_tea", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q83437245", "amenity": "cafe", "cuisine": "vietnamese;bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "Bambu", "brand:wikidata": "Q83437245", "cuisine": "vietnamese;bubble_tea", "name": "Bambu", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Barista": {"name": "Barista", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/BaristaCoffeeCompany/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q644735", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Barista", "brand:wikidata": "Q644735", "brand:wikipedia": "en:Barista (company)", "cuisine": "coffee_shop", "name": "Barista", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["in", "lk", "mv", "np"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Beck's Coffee Shop": {"name": "Beck's Coffee Shop", "icon": "maki-cafe", "imageURL": "https://pbs.twimg.com/profile_images/773289632230322180/YtO0yEVy_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11191008", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"alt_name": "ベックス・コーヒーショップ", "amenity": "cafe", "brand": "Beck's Coffee Shop", "brand:wikidata": "Q11191008", "brand:wikipedia": "ja:BECK'S COFFEE SHOP", "cuisine": "coffee_shop", "name": "Beck's Coffee Shop", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["jp"], "terms": ["beck's coffe shop"], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Biggby Coffee": {"name": "Biggby Coffee", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/BiggbyCoffee.Bhappy/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4906876", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Biggby Coffee", "brand:wikidata": "Q4906876", "brand:wikipedia": "en:Biggby Coffee", "cuisine": "coffee_shop", "name": "Biggby Coffee", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2109,8 +2110,8 @@
   "amenity/cafe/coffee_shop/Café Dépôt": {"name": "Café Dépôt", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/cafedepot.ca/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64924449", "amenity": "cafe", "cuisine": "coffee_shop;cake;bagel;bistro"}, "addTags": {"amenity": "cafe", "brand": "Café Dépôt", "brand:wikidata": "Q64924449", "cuisine": "coffee_shop;cake;bagel;bistro", "name": "Café Dépôt", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Café Martínez": {"name": "Café Martínez", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/CafeMartinezSitioOficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16540032", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Café Martínez", "brand:wikidata": "Q16540032", "brand:wikipedia": "es:Café Martínez", "cuisine": "coffee_shop", "name": "Café Martínez", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["ar"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Caribou Coffee": {"name": "Caribou Coffee", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/cariboucoffeeturkiye/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5039494", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Caribou Coffee", "brand:wikidata": "Q5039494", "brand:wikipedia": "en:Caribou Coffee", "cuisine": "coffee_shop", "name": "Caribou Coffee", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/Chatime": {"name": "Chatime", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/ChatimeCanada/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16829306", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "Chatime", "brand:en": "Chatime", "brand:wikidata": "Q16829306", "brand:wikipedia": "en:Chatime", "brand:zh": "日出茶太", "cuisine": "bubble_tea", "name": "Chatime", "name:en": "Chatime", "name:zh": "日出茶太", "takeaway": "yes"}, "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/CoCo": {"name": "CoCo", "icon": "maki-cafe", "imageURL": "https://pbs.twimg.com/profile_images/1143629340564963328/C8Axen7r_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64827025", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "CoCo", "brand:wikidata": "Q64827025", "cuisine": "bubble_tea", "name": "Coco", "takeaway": "yes"}, "countryCodes": ["au"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/Chatime": {"name": "Chatime", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/ChatimeCanada/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16829306", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "Chatime", "brand:en": "Chatime", "brand:wikidata": "Q16829306", "brand:wikipedia": "en:Chatime", "brand:zh": "日出茶太", "cuisine": "bubble_tea", "name": "Chatime", "name:en": "Chatime", "name:zh": "日出茶太", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/CoCo": {"name": "CoCo", "icon": "temaki-bubble_tea", "imageURL": "https://pbs.twimg.com/profile_images/1143629340564963328/C8Axen7r_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64827025", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "CoCo", "brand:wikidata": "Q64827025", "cuisine": "bubble_tea", "name": "Coco", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["au"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Coffee Fellows": {"name": "Coffee Fellows", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/CoffeeFellowsDeutschland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q23461429", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Coffee Fellows", "brand:wikidata": "Q23461429", "brand:wikipedia": "en:Coffee Fellows", "cuisine": "coffee_shop", "name": "Coffee Fellows", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["de", "lu", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Coffee House (Finland)": {"name": "Coffee House (Finland)", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/raflaamo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11855430", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Coffee House", "brand:wikidata": "Q11855430", "brand:wikipedia": "fi:Coffee House", "cuisine": "coffee_shop", "name": "Coffee House", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Coffee Island": {"name": "Coffee Island", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/CoffeeIslandUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60867333", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Coffee Island", "brand:wikidata": "Q60867333", "brand:wikipedia": "en:Coffee Island", "cuisine": "coffee_shop", "name": "Coffee Island", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["cy", "gr"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2128,8 +2129,8 @@
   "amenity/cafe/coffee_shop/Espresso House": {"name": "Espresso House", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/196870344516819/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q10489162", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Espresso House", "brand:wikidata": "Q10489162", "brand:wikipedia": "en:Espresso House", "cuisine": "coffee_shop", "name": "Espresso House", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["dk", "fi", "no", "se"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Fran's Café": {"name": "Fran's Café", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/franscafeoficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62075645", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Fran's Café", "brand:wikidata": "Q62075645", "cuisine": "coffee_shop", "name": "Fran's Café", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["br"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Gloria Jean's": {"name": "Gloria Jean's", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/gloriajeanscoffeesAUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2666365", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Gloria Jean's", "brand:wikidata": "Q2666365", "brand:wikipedia": "en:Gloria Jean's Coffees", "cuisine": "coffee_shop", "name": "Gloria Jean's", "official_name": "Gloria Jean's Coffees", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/Gong Cha (Vietnam)": {"name": "Gong Cha (Vietnam)", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe"}, "addTags": {"alt_name:vi": "Cống Trà", "amenity": "cafe", "brand": "Gong Cha", "brand:vi": "Gong Cha", "brand:wikidata": "Q5581670", "brand:wikipedia": "vi:Gong Cha", "brand:zh": "貢茶", "cuisine": "bubble_tea", "name": "Gong Cha", "name:vi": "Gong Cha", "name:zh": "貢茶", "takeaway": "yes"}, "countryCodes": ["vn"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/Gong Cha (worldwide)": {"name": "Gong Cha (worldwide)", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "Gong Cha", "brand:wikidata": "Q5581670", "brand:wikipedia": "en:Gong Cha", "brand:zh": "貢茶", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "Gong Cha", "name:zh": "貢茶", "takeaway": "yes"}, "countryCodes": ["au", "bn", "ca", "mm", "mo", "my", "nz", "ph", "sg", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/Gong Cha (Vietnam)": {"name": "Gong Cha (Vietnam)", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"alt_name:vi": "Cống Trà", "amenity": "cafe", "brand": "Gong Cha", "brand:vi": "Gong Cha", "brand:wikidata": "Q5581670", "brand:wikipedia": "vi:Gong Cha", "brand:zh": "貢茶", "cuisine": "bubble_tea", "name": "Gong Cha", "name:vi": "Gong Cha", "name:zh": "貢茶", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["vn"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/Gong Cha (worldwide)": {"name": "Gong Cha (worldwide)", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "Gong Cha", "brand:wikidata": "Q5581670", "brand:wikipedia": "en:Gong Cha", "brand:zh": "貢茶", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "Gong Cha", "name:zh": "貢茶", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["au", "bn", "ca", "mm", "mo", "my", "nz", "ph", "sg", "us"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Havanna": {"name": "Havanna", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/havannaargentina/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2900869", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Havanna", "brand:wikidata": "Q2900869", "brand:wikipedia": "es:Havanna", "cuisine": "coffee_shop", "name": "Havanna", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["ar", "pe"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Highlands Coffee": {"name": "Highlands Coffee", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/highlandscoffeevietnam/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5759361", "amenity": "cafe", "cuisine": "coffee_shop;vietnamese"}, "addTags": {"amenity": "cafe", "brand": "Highlands Coffee", "brand:wikidata": "Q5759361", "brand:wikipedia": "vi:Highlands Coffee", "cuisine": "coffee_shop;vietnamese", "name": "Highlands Coffee", "name:en": "Highlands Coffee", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["vn"], "terms": ["highlands"], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Hudsons Coffee": {"name": "Hudsons Coffee", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/HudsonsCoffee/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5929076", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Hudsons Coffee", "brand:wikidata": "Q5929076", "brand:wikipedia": "en:Hudsons Coffee", "cuisine": "coffee_shop", "name": "Hudsons Coffee", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["au", "sg"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2150,10 +2151,10 @@
   "amenity/cafe/coffee_shop/Prime": {"name": "Prime", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/PRIMENATURALFOOD/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62122839", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Prime", "brand:wikidata": "Q62122839", "cuisine": "coffee_shop", "name": "Prime", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Pronto": {"name": "Pronto", "icon": "maki-cafe", "imageURL": "https://pbs.twimg.com/profile_images/1002458417733120000/lQc9dDWQ_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11336224", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Pronto", "brand:wikidata": "Q11336224", "brand:wikipedia": "ja:プロントコーポレーション", "cuisine": "coffee_shop", "name": "Pronto", "name:ja": "プロント", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["jp"], "terms": ["プロント"], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Pumpkin": {"name": "Pumpkin", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q27825961", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Pumpkin", "brand:wikidata": "Q27825961", "brand:wikipedia": "en:Pumpkin Café Shop", "cuisine": "coffee_shop", "name": "Pumpkin", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["gb"], "terms": ["pumpkin cafe", "pumpkin cafe shop"], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/Quickly": {"name": "Quickly", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/quicklyphilippines/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3771463", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "Quickly", "brand:en": "Quickly", "brand:wikidata": "Q3771463", "brand:wikipedia": "en:Quickly", "brand:zh": "快可立", "cuisine": "bubble_tea", "name": "Quickly", "name:en": "Quickly", "name:zh": "快可立", "takeaway": "yes"}, "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/Quickly": {"name": "Quickly", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/quicklyphilippines/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3771463", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "Quickly", "brand:en": "Quickly", "brand:wikidata": "Q3771463", "brand:wikipedia": "en:Quickly", "brand:zh": "快可立", "cuisine": "bubble_tea", "name": "Quickly", "name:en": "Quickly", "name:zh": "快可立", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Second Cup": {"name": "Second Cup", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/SecondCup/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q862180", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Second Cup", "brand:wikidata": "Q862180", "brand:wikipedia": "en:Second Cup", "cuisine": "coffee_shop", "name": "Second Cup", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Segafredo": {"name": "Segafredo", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/SegafredoZanettiItalia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q21282762", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Segafredo", "brand:wikidata": "Q21282762", "brand:wikipedia": "it:Segafredo Zanetti", "cuisine": "coffee_shop", "name": "Segafredo", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/Sharetea": {"name": "Sharetea", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/shareteaglobal/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64827032", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "Sharetea", "brand:wikidata": "Q64827032", "cuisine": "bubble_tea", "name": "Sharetea", "name:en": "Sharetea", "name:zh": "歇腳亭", "takeaway": "yes"}, "countryCodes": ["au", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/Sharetea": {"name": "Sharetea", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/shareteaglobal/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64827032", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "Sharetea", "brand:wikidata": "Q64827032", "cuisine": "bubble_tea", "name": "Sharetea", "name:en": "Sharetea", "name:zh": "歇腳亭", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["au", "us"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/Starbucks": {"name": "Starbucks", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/Starbucks/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q37158", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "Starbucks", "brand:wikidata": "Q37158", "brand:wikipedia": "en:Starbucks", "cuisine": "coffee_shop", "name": "Starbucks", "official_name": "Starbucks Coffee", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/The Coffee Bean & Tea Leaf": {"name": "The Coffee Bean & Tea Leaf", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/thecoffeebean/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1141384", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "The Coffee Bean & Tea Leaf", "brand:wikidata": "Q1141384", "brand:wikipedia": "en:The Coffee Bean & Tea Leaf", "cuisine": "coffee_shop", "name": "The Coffee Bean & Tea Leaf", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/The Coffee Club": {"name": "The Coffee Club", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/tccau/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7726599", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "The Coffee Club", "brand:wikidata": "Q7726599", "brand:wikipedia": "en:The Coffee Club", "cuisine": "coffee_shop", "name": "The Coffee Club", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": [], "matchScore": 2, "suggestion": true},
@@ -2190,17 +2191,17 @@
   "amenity/cafe/coffee_shop/タリーズコーヒー": {"name": "タリーズコーヒー", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/TullysCoffeeShops/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3541983", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "タリーズコーヒー", "brand:en": "Tully's Coffee", "brand:ja": "タリーズコーヒー", "brand:wikidata": "Q3541983", "brand:wikipedia": "en:Tully's Coffee", "cuisine": "coffee_shop", "name": "タリーズコーヒー", "name:en": "Tully's Coffee", "name:ja": "タリーズコーヒー", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/ドトールコーヒーショップ": {"name": "ドトールコーヒーショップ", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/Fun.Doutor.Fan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11322732", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "ドトールコーヒーショップ", "brand:en": "Doutor", "brand:ja": "ドトールコーヒーショップ", "brand:wikidata": "Q11322732", "brand:wikipedia": "ja:ドトールコーヒーショップ", "cuisine": "coffee_shop", "name": "ドトールコーヒーショップ", "name:en": "Doutor Coffee Shop", "name:ja": "ドトールコーヒーショップ", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["jp"], "terms": ["ドトールコーヒー"], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/ルノアール": {"name": "ルノアール", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/CoffeeRoomRenoir/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11649991", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "ルノアール", "brand:en": "Renoir", "brand:ja": "ルノアール", "brand:wikidata": "Q11649991", "brand:wikipedia": "ja:銀座ルノアール", "cuisine": "coffee_shop", "name": "ルノアール", "name:en": "Renoir", "name:ja": "ルノアール", "official_name": "喫茶室ルノアール", "official_name:en": "Ginza Renoir", "official_name:ja": "喫茶室ルノアール", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/快可立": {"name": "快可立", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/quicklyphilippines/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3771463", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "快可立", "brand:en": "Quickly", "brand:wikidata": "Q3771463", "brand:wikipedia": "zh:快可立", "brand:zh": "快可立", "cuisine": "bubble_tea", "name": "快可立", "name:en": "Quickly", "name:zh": "快可立", "takeaway": "yes"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/日出茶太": {"name": "日出茶太", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/ChatimeCanada/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16829306", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "日出茶太", "brand:en": "Chatime", "brand:wikidata": "Q16829306", "brand:wikipedia": "zh:日出茶太", "brand:zh": "日出茶太", "cuisine": "bubble_tea", "name": "日出茶太", "name:en": "Chatime", "name:zh": "日出茶太", "takeaway": "yes"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/快可立": {"name": "快可立", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/quicklyphilippines/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3771463", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "快可立", "brand:en": "Quickly", "brand:wikidata": "Q3771463", "brand:wikipedia": "zh:快可立", "brand:zh": "快可立", "cuisine": "bubble_tea", "name": "快可立", "name:en": "Quickly", "name:zh": "快可立", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/日出茶太": {"name": "日出茶太", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/ChatimeCanada/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16829306", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "日出茶太", "brand:en": "Chatime", "brand:wikidata": "Q16829306", "brand:wikipedia": "zh:日出茶太", "brand:zh": "日出茶太", "cuisine": "bubble_tea", "name": "日出茶太", "name:en": "Chatime", "name:zh": "日出茶太", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/星乃珈琲店": {"name": "星乃珈琲店", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/hoshinocoffee.jp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q88396880", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "星乃珈琲店", "brand:en": "Hoshino Coffee", "brand:ja": "星乃珈琲店", "brand:wikidata": "Q88396880", "cuisine": "coffee_shop", "name": "星乃珈琲店", "name:en": "Hoshino Coffee", "name:ja": "星乃珈琲店", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/星巴克": {"name": "星巴克", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/Starbucks/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q37158", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "星巴克", "brand:en": "Starbucks", "brand:wikidata": "Q37158", "brand:wikipedia": "zh:星巴克", "brand:zh": "星巴克", "cuisine": "coffee_shop", "name": "星巴克", "name:en": "Starbucks", "name:zh": "星巴克", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["cn", "tw"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/珈琲館": {"name": "珈琲館", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/kohikancorporation/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11573290", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "珈琲館", "brand:en": "Kohikan", "brand:ja": "珈琲館", "brand:wikidata": "Q11573290", "brand:wikipedia": "ja:珈琲館", "cuisine": "coffee_shop", "name": "珈琲館", "name:en": "Kohikan", "name:ja": "珈琲館", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/貢茶 Gong Cha": {"name": "貢茶 Gong Cha", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "貢茶 Gong Cha", "brand:en": "Gong Cha", "brand:wikidata": "Q5581670", "brand:wikipedia": "zh:貢茶 (連鎖店)", "brand:zh": "貢茶", "cuisine": "bubble_tea", "name": "貢茶 Gong Cha", "name:en": "Gong Cha", "name:zh": "貢茶", "takeaway": "yes"}, "countryCodes": ["hk"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/貢茶 (Japan)": {"name": "貢茶 (Japan)", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "貢茶", "brand:ja": "貢茶", "brand:wikidata": "Q5581670", "brand:wikipedia": "ja:貢茶", "brand:zh": "貢茶", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "貢茶", "name:ja": "貢茶", "name:zh": "貢茶", "takeaway": "yes"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/貢茶 (Taiwan)": {"name": "貢茶 (Taiwan)", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "貢茶", "brand:wikidata": "Q5581670", "brand:wikipedia": "zh:貢茶 (連鎖店)", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "貢茶", "name:zh": "貢茶", "takeaway": "yes"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/贡茶 (China)": {"name": "贡茶 (China)", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "贡茶", "brand:wikidata": "Q5581670", "brand:wikipedia": "zh:贡茶 (连锁店)", "brand:zh-Hans": "贡茶", "brand:zh-Hant": "貢茶", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "贡茶", "name:zh-Hans": "贡茶", "name:zh-Hant": "貢茶", "takeaway": "yes"}, "countryCodes": ["cn"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/貢茶 Gong Cha": {"name": "貢茶 Gong Cha", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "貢茶 Gong Cha", "brand:en": "Gong Cha", "brand:wikidata": "Q5581670", "brand:wikipedia": "zh:貢茶 (連鎖店)", "brand:zh": "貢茶", "cuisine": "bubble_tea", "name": "貢茶 Gong Cha", "name:en": "Gong Cha", "name:zh": "貢茶", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["hk"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/貢茶 (Japan)": {"name": "貢茶 (Japan)", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "貢茶", "brand:ja": "貢茶", "brand:wikidata": "Q5581670", "brand:wikipedia": "ja:貢茶", "brand:zh": "貢茶", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "貢茶", "name:ja": "貢茶", "name:zh": "貢茶", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/貢茶 (Taiwan)": {"name": "貢茶 (Taiwan)", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "貢茶", "brand:wikidata": "Q5581670", "brand:wikipedia": "zh:貢茶 (連鎖店)", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "貢茶", "name:zh": "貢茶", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/贡茶 (China)": {"name": "贡茶 (China)", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "贡茶", "brand:wikidata": "Q5581670", "brand:wikipedia": "zh:贡茶 (连锁店)", "brand:zh-Hans": "贡茶", "brand:zh-Hant": "貢茶", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "贡茶", "name:zh-Hans": "贡茶", "name:zh-Hant": "貢茶", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["cn"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/路易莎咖啡": {"name": "路易莎咖啡", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/louisacoffeeofficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q67933328", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "路易莎咖啡", "brand:en": "Louisa Coffee", "brand:wikidata": "Q67933328", "brand:wikipedia": "zh:路易莎咖啡", "brand:zh": "路易莎咖啡", "cuisine": "coffee_shop", "name": "路易莎咖啡", "name:en": "Louisa Coffee", "name:zh": "路易莎咖啡", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/cafe/공차": {"name": "공차", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "공차", "brand:ko": "공차", "brand:wikidata": "Q5581670", "brand:wikipedia": "ko:공차", "brand:zh": "貢茶", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "공차", "name:ko": "공차", "name:zh": "貢茶", "takeaway": "yes"}, "countryCodes": ["kr"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/cafe/bubble_tea/공차": {"name": "공차", "icon": "temaki-bubble_tea", "imageURL": "https://graph.facebook.com/GongChaTaiwan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5581670", "amenity": "cafe", "cuisine": "bubble_tea"}, "addTags": {"amenity": "cafe", "brand": "공차", "brand:ko": "공차", "brand:wikidata": "Q5581670", "brand:wikipedia": "ko:공차", "brand:zh": "貢茶", "cuisine": "bubble_tea", "int_name": "Gong Cha", "name": "공차", "name:ko": "공차", "name:zh": "貢茶", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "countryCodes": ["kr"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/cafe/coffee_shop/스타벅스": {"name": "스타벅스", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/Starbucks/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q37158", "amenity": "cafe", "cuisine": "coffee_shop"}, "addTags": {"amenity": "cafe", "brand": "스타벅스", "brand:en": "Starbucks", "brand:ko": "스타벅스", "brand:wikidata": "Q37158", "brand:wikipedia": "ko:스타벅스", "cuisine": "coffee_shop", "name": "스타벅스", "name:en": "Starbucks", "name:ko": "스타벅스", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "countryCodes": ["kr"], "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/car_rental/Alamo": {"name": "Alamo", "icon": "maki-car-rental", "imageURL": "https://graph.facebook.com/AlamoRentACar/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1429287", "amenity": "car_rental"}, "addTags": {"amenity": "car_rental", "brand": "Alamo", "brand:wikidata": "Q1429287", "brand:wikipedia": "en:Alamo Rent a Car", "name": "Alamo"}, "terms": [], "matchScore": 2, "suggestion": true},
   "amenity/car_rental/Avis": {"name": "Avis", "icon": "maki-car-rental", "imageURL": "https://graph.facebook.com/avis/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q791136", "amenity": "car_rental"}, "addTags": {"amenity": "car_rental", "brand": "Avis", "brand:wikidata": "Q791136", "brand:wikipedia": "en:Avis Car Rental", "name": "Avis"}, "terms": ["avis car rental"], "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/amenity/cafe/bubble_tea.json b/data/presets/presets/amenity/cafe/bubble_tea.json
new file mode 100644
index 000000000..417fbd26d
--- /dev/null
+++ b/data/presets/presets/amenity/cafe/bubble_tea.json
@@ -0,0 +1,23 @@
+{
+    "icon": "temaki-bubble_tea",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "cafe",
+        "cuisine": "bubble_tea"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "bubble_tea"
+    },
+    "terms": [
+        "boba",
+        "bubble milk tea",
+        "pearl milk tea",
+        "taiwanese tea drink",
+        "tapioca"
+    ],
+    "name": "Bubble Tea Cafe"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 0aa0e098a..e6fd86434 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -85,6 +85,7 @@
     {"key": "amenity", "value": "boat_rental", "description": "🄿 Boat Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/boat_rental.svg"},
     {"key": "amenity", "value": "bureau_de_change", "description": "🄿 Currency Exchange", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/money_hand.svg"},
     {"key": "amenity", "value": "cafe", "description": "🄿 Cafe", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cafe-15.svg"},
+    {"key": "cuisine", "value": "bubble_tea", "description": "🄿 Bubble Tea Cafe", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bubble_tea.svg"},
     {"key": "cuisine", "value": "coffee_shop", "description": "🄿 Coffeehouse", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cafe-15.svg"},
     {"key": "amenity", "value": "car_pooling", "description": "🄿 Car Pooling Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_pool.svg"},
     {"key": "amenity", "value": "car_rental", "description": "🄿 Car Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-rental-15.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index efa9b090a..7f85dcf7b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5347,6 +5347,10 @@
                     "name": "Cafe",
                     "terms": "bistro,coffee,tea"
                 },
+                "amenity/cafe/bubble_tea": {
+                    "name": "Bubble Tea Cafe",
+                    "terms": "boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca"
+                },
                 "amenity/cafe/coffee_shop": {
                     "name": "Coffeehouse",
                     "terms": "americano,brew,cafe,café,caffe,caffè,cappuccino,cocoa,coffee shop,drip,espresso,hot drinks,latte,macchiato,tea"