diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 028278ae63..5e68318b8d 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -203,18 +203,18 @@
 	<!-- Do search in current viewport only -->
 	<string name="search_mode_viewport">畫面中的地圖</string>
 	<!-- Search Suggestion -->
-	<string name="food">酒吧</string>
+	<string name="food">飲食</string>
 	<!-- Search Suggestion -->
-	<string name="transport">巴士站</string>
+	<string name="transport">運輸</string>
 	<!-- Search Suggestion -->
 	<string name="fuel">加油站</string>
 	<!-- Search Suggestion -->
 	<string name="parking">停車場</string>
 	<!-- Search Suggestion -->
-	<string name="shop">市場</string>
+	<string name="shop">購物</string>
 	<string name="hotel">飯店</string>
 	<!-- Search Suggestion -->
-	<string name="tourism">視野</string>
+	<string name="tourism">旅遊景點</string>
 	<!-- Search Suggestion -->
 	<string name="entertainment">娛樂</string>
 	<!-- Search Suggestion -->
diff --git a/data/categories.txt b/data/categories.txt
index 353caecdb8..753876af97 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -40,7 +40,7 @@ zh:匯率|理財|外幣|兌換|貨幣
 amenity-bar|amenity-pub
 en:2bar|2pub|beer|drink|food
 ru:2бар|2паб|пиво|выпить|еда
-de:2Bar|2Pub|Bier|essen
+de:2Bar|2Pub|Bier|Essen
 fr:2bar|2bière|pub|repas
 it:2bar|2birra|pub|mangiare
 es:2bar|2pub|comer
@@ -48,7 +48,7 @@ ko:바|술집|맥주|음료|음식
 ja:バー|パブ|ビール|ドリンク|フード|飯
 cs:2bar|pivo|pití|jídlo|voda|pitná voda|tekutiny
 nl:2bar|2pub|bier|drinken|eten
-zh:酒吧|酒館|飲酒|PUB|吧台
+zh:酒吧|酒館|飲酒|PUB|吧台|飲食
 
 amenity-cafe
 en:3cafe|3restaurant|3food
@@ -74,7 +74,7 @@ ko:패스트 푸드|레스토랑|카페|테이크 아웃|푸드
 ja:ファストフード|レストラン|カフェ|テイクアウト|フード|飯
 cs:2rychlé občerstvení|4fastfood|kavárna|restaurace|jídlo
 nl:4fast food|3restaurant|3cafe|afhaaleten|3eten
-zh:速食店|麥當勞|肯德雞|漢堡王|頂呱呱|薯條|速食|用餐
+zh:速食店|麥當勞|肯德雞|漢堡王|頂呱呱|薯條|速食|用餐|飲食
 
 amenity-restaurant
 en:3restaurant|3cafe|3food
@@ -113,7 +113,7 @@ ko:베이커리|쇼핑
 ja:ベーカリー|ショップ|店
 cs:3pekárna|obchod
 nl:3bakker|winkel
-zh:2麵包店|2蛋糕店|烘焙|麵包|蛋糕|飲食
+zh:2麵包店|2蛋糕店|烘焙|麵包|蛋糕|購物
 
 shop-convenience
 en:2shop
@@ -204,7 +204,7 @@ ko:지하철|교통|수송
 ja:地下鉄|交通|輸送
 cs:3metro|3podzemka|doprava
 nl:3metro|transport
-zh:地鐵|2地下鐵
+zh:地鐵|2地下鐵|運輸
 
 tourism-attraction
 en:3attraction|3tourism|3sights
@@ -488,7 +488,7 @@ ko:우편
 ja:電子メール
 cs:3pošta
 nl:3post
-zh:1郵局
+zh:1郵局|郵筒
 
 amenity-recycling
 en:recycling|trash|bin|garbage
@@ -950,7 +950,7 @@ ko:호텔|호스텔
 ja:ホテル|ホステル
 cs:2hotel|hostel|ubytovna|motel
 nl:2hotel|hostel|motel
-zh:飯店|3汽車旅館|3motel|旅館|住宿|賓館|飯店|酒店|旅舍|招待所
+zh:飯店|3汽車旅館|3motel|旅館|住宿|賓館|酒店|旅舍|招待所
 
 shop-hairdresser
 en:3hairdresser
@@ -1106,7 +1106,7 @@ ko:시장|쇼핑
 ja:市場|店
 cs:4tržiště|samoobsluha|market|obchod
 nl:4markt|winkel
-zh:市場|市集
+zh:市場|市集|購物
 
 amenity-nightclub
 en:3nightclub|3disco|dance|entertainment
@@ -1119,7 +1119,7 @@ ko:나이트 클럽|엔터테인먼트
 ja:ナイトクラブ|エンターテイメント
 cs:4noční klub|3disco|3klub|zábava
 nl:3nightclub|3disco|dansen|uitgaan
-zh:夜店|2俱樂部|酒|喝酒|跳舞|舞|2夜生活
+zh:夜店|2俱樂部|酒|喝酒|跳舞|舞|2夜生活|娛樂
 
 amenity-embassy
 en:4embassy
@@ -1145,7 +1145,7 @@ ko:기념물|관광
 ja:記念碑|観光
 cs:pomník|památka|atrakce|zajímavost|pamětihodnost
 nl:gedenkteken|monument|attractie|toerisme
-zh:紀念碑|紀念館
+zh:紀念碑|紀念館|旅遊景點
 
 historic-monument
 en:monument|attraction|tourism|sights
@@ -1158,7 +1158,7 @@ ko:기념물|관광
 ja:記念碑|観光
 cs:zajímavost|pomník|památka|pamětihodnost
 nl:monument|attractie|toerisme
-zh:紀念碑|紀念塔|紀念館
+zh:紀念碑|紀念塔|紀念館|旅遊景點
 
 historic-ruins
 en:ruins|attraction|tourism|sights
@@ -1171,7 +1171,7 @@ ko:유적|관광
 ja:古跡|古蹟|廃墟|遺址|観光
 cs:ruiny|zřícenina|pamětihodnost
 nl:ruïne|attractie|toerisme
-zh:廢墟|古蹟|遺址
+zh:廢墟|古蹟|遺址|旅遊景點
 
 historic-castle
 en:castle|attraction|tourism|sights
@@ -1184,7 +1184,7 @@ ko:대저택|관광
 ja:城|観光
 cs:zámek|atrakce|pamětihodnosti
 nl:kasteel|attractie|toerisme
-zh:城堡|堡|古蹟|歷史
+zh:城堡|堡|古蹟|歷史|旅遊景點
 
 historic-archaeological_site
 en:archaeological site|attraction|tourism|sights
@@ -1197,7 +1197,7 @@ ko:발굴|관광
 ja:発掘|観光
 cs:vykopávky|pamětihodnost
 nl:archeologische opgraving|attractie|toerisme
-zh:2考古遺址|考古|遺址|古蹟|歷史
+zh:2考古遺址|考古|遺址|古蹟|歷史|旅遊景點
 
 natural-bay
 en:bay
@@ -1288,7 +1288,7 @@ ko:박물관|관광
 ja:博物館|観光
 cs:4muzeum|pamětihodnosti
 nl:4museum|attractie|toerisme
-zh:2博物館|旅遊|觀光|景點|遊覽|歷史
+zh:2博物館|旅遊|觀光|景點|遊覽|歷史|旅遊景點
 
 tourism-guest_house
 en:guest house|hotel|hostel
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index fddf926816..4bcc8d454f 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -325,10 +325,10 @@
 "search_mode_viewport" = "畫面中的地圖";
 
 /* Search Suggestion */
-"food" = "酒吧";
+"food" = "飲食";
 
 /* Search Suggestion */
-"transport" = "巴士站";
+"transport" = "運輸";
 
 /* Search Suggestion */
 "fuel" = "加油站";
@@ -337,12 +337,12 @@
 "parking" = "停車場";
 
 /* Search Suggestion */
-"shop" = "市場";
+"shop" = "購物";
 
 "hotel" = "飯店";
 
 /* Search Suggestion */
-"tourism" = "視野";
+"tourism" = "旅遊景點";
 
 /* Search Suggestion */
 "entertainment" = "娛樂";
diff --git a/strings.txt b/strings.txt
index f62e571a51..153ac01964 100644
--- a/strings.txt
+++ b/strings.txt
@@ -1440,7 +1440,7 @@
     ko = 음식
     nl = eten
     ru = еда
-    zh = 酒吧
+    zh = 飲食
   [transport]
     en = transport
     tags = ios, android
@@ -1454,7 +1454,7 @@
     ko = 수송
     nl = transport
     ru = транспорт
-    zh = 巴士站
+    zh = 運輸
   [fuel]
     en = gas
     tags = ios, android
@@ -1496,7 +1496,7 @@
     ko = 쇼핑
     nl = winkel
     ru = магазин
-    zh = 市場
+    zh = 購物
   [hotel]
     en = hotel
     tags = ios, android
@@ -1523,7 +1523,7 @@
     ko = 관광
     nl = toerisme
     ru = достопримечательность
-    zh = 視野
+    zh = 旅遊景點
   [entertainment]
     en = entertainment
     tags = ios, android