From b1f3760a81a8b41563711f93ff086f9a273f601d Mon Sep 17 00:00:00 2001
From: Yevgen Antymyrov <turist@gmail.com>
Date: Wed, 10 Jan 2018 11:35:59 +0100
Subject: [PATCH 1/2] Updating Ukrainian dictionaries, small fixes and
 additional variants.

---
 resources/dictionaries/uk/house_numbers.txt   |  2 +-
 resources/dictionaries/uk/near.txt            |  6 +++---
 resources/dictionaries/uk/personal_titles.txt |  8 +++++++-
 resources/dictionaries/uk/qualifiers.txt      |  6 +++---
 resources/dictionaries/uk/street_types.txt    | 13 +++++++------
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/resources/dictionaries/uk/house_numbers.txt b/resources/dictionaries/uk/house_numbers.txt
index 6c9d1104..42a7b2df 100644
--- a/resources/dictionaries/uk/house_numbers.txt
+++ b/resources/dictionaries/uk/house_numbers.txt
@@ -1,4 +1,4 @@
 дом|д
 dom|d
 будинок|буд
-budnyok|bud
\ No newline at end of file
+budynok|bud
diff --git a/resources/dictionaries/uk/near.txt b/resources/dictionaries/uk/near.txt
index d8ed963f..2133aded 100644
--- a/resources/dictionaries/uk/near.txt
+++ b/resources/dictionaries/uk/near.txt
@@ -14,11 +14,11 @@ poruch
 poruch tut
 поруч з
 poruch z
-поруч з мною
-poruch z mnoyu
+поруч зі мною
+poruch zi mnoyu
 тут
 tut
 у
 u
 в
-v
\ No newline at end of file
+v
diff --git a/resources/dictionaries/uk/personal_titles.txt b/resources/dictionaries/uk/personal_titles.txt
index e8333e27..5873d75c 100644
--- a/resources/dictionaries/uk/personal_titles.txt
+++ b/resources/dictionaries/uk/personal_titles.txt
@@ -1,3 +1,9 @@
 академіка
 генерала
-маршала
\ No newline at end of file
+маршала
+гетьмана
+архітектора
+братів
+сержанта
+лейтенанта
+професора
diff --git a/resources/dictionaries/uk/qualifiers.txt b/resources/dictionaries/uk/qualifiers.txt
index 3d7106b8..6bf2d5df 100644
--- a/resources/dictionaries/uk/qualifiers.txt
+++ b/resources/dictionaries/uk/qualifiers.txt
@@ -2,7 +2,7 @@
 blok|bl
 квартал|кварт|кв|кв-л
 kvartal|kvart|kv|kv-l
-област|обл
+область|обл
 oblast|obl
-раион|р-н
-raion|r-n
\ No newline at end of file
+район|р-н
+raion|r-n
diff --git a/resources/dictionaries/uk/street_types.txt b/resources/dictionaries/uk/street_types.txt
index 268a8c7f..3bfe9844 100644
--- a/resources/dictionaries/uk/street_types.txt
+++ b/resources/dictionaries/uk/street_types.txt
@@ -11,15 +11,16 @@ naberezhna|nab
 provulok|pro
 площа|пл
 ploshcha|pl
-проезд|пр
-proyezd
+проїзд|пр
+proyizd
 проспект|просп|пр
 prospekt|pr|prkt
-линия|лин
-linya|lin
+лінія|лін
+liniya|lin
+liniia|lin
 шосе|ш
 shose|sh
 тупик|туп
-tupik|tup
+tupyk|tup
 вулиця|вул
-vulytsya|vul
\ No newline at end of file
+vulytsya|vul

From c58b16e745a89ed2fd223a2f754bdb14b6bdb4de Mon Sep 17 00:00:00 2001
From: Travis <thatdatabaseguy@users.noreply.github.com>
Date: Thu, 11 Jan 2018 23:35:43 +0000
Subject: [PATCH 2/2] [auto][ci skip] Adding data files from Travis build #341

---
 src/address_expansion_data.c | 523 ++++++++++++++++++-----------------
 1 file changed, 266 insertions(+), 257 deletions(-)

diff --git a/src/address_expansion_data.c b/src/address_expansion_data.c
index 15b34c62..fd814817 100644
--- a/src/address_expansion_data.c
+++ b/src/address_expansion_data.c
@@ -5321,7 +5321,7 @@ char *canonical_strings[] = {
     "дом",
     "dom",
     "будинок",
-    "budnyok",
+    "budynok",
     "цокольний поверх",
     "tsokolʹnyy poverkh",
     "поверх",
@@ -5379,9 +5379,9 @@ char *canonical_strings[] = {
     "blok",
     "квартал",
     "kvartal",
-    "област",
+    "область",
     "oblast",
-    "раион",
+    "район",
     "raion",
     "і",
     "i",
@@ -5398,15 +5398,16 @@ char *canonical_strings[] = {
     "provulok",
     "площа",
     "ploshcha",
-    "проезд",
+    "проїзд",
     "проспект",
     "prospekt",
-    "линия",
-    "linya",
+    "лінія",
+    "liniya",
+    "liniia",
     "шосе",
     "shose",
     "тупик",
-    "tupik",
+    "tupyk",
     "вулиця",
     "vulytsya",
     "квартира",
@@ -84458,8 +84459,8 @@ address_expansion_rule_t expansion_rules[] = {
     {"bey", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"no", 1, {DICTIONARY_NUMBER}, 5332},
     {"z", 1, {DICTIONARY_DIRECTIONAL}, 5317},
-    {"of", 1, {DICTIONARY_UNIT_NUMBERED}, 5418},
     {"пожежна станція", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"vul", 1, {DICTIONARY_STREET_TYPE}, 5409},
     {"лікарня", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ковзанка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"маиданчик для треилерів", 1, {DICTIONARY_PLACE_NAME}, 5369},
@@ -84468,7 +84469,6 @@ address_expansion_rule_t expansion_rules[] = {
     {"спритні напої", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"пр", 1, {DICTIONARY_STREET_TYPE}, 5399},
     {"музеи", 1, {DICTIONARY_PLACE_NAME}, 5371},
-    {"tupik", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"півд", 1, {DICTIONARY_DIRECTIONAL}, 5314},
     {"поруч тут", 1, {DICTIONARY_NEAR}, -1},
     {"прокат велосипедів", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -84476,6 +84476,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"прокат автомобілів", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"гірськии притулок", 1, {DICTIONARY_PLACE_NAME}, 5368},
     {"skhid", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"район", 1, {DICTIONARY_QUALIFIER}, -1},
     {"mizh", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"na rozi", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"руїни", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -84489,25 +84490,26 @@ address_expansion_rule_t expansion_rules[] = {
     {"rozi", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"навколо", 1, {DICTIONARY_NEAR}, -1},
     {"обл", 1, {DICTIONARY_QUALIFIER}, 5379},
+    {"км", 1, {DICTIONARY_UNIT_NUMBERED}, 5414},
     {"нижній поверх", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"ш", 1, {DICTIONARY_STREET_TYPE}, 5403},
+    {"проїзд", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"право", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"р-н", 1, {DICTIONARY_QUALIFIER}, 5381},
-    {"kabinet", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"оф", 1, {DICTIONARY_UNIT_NUMBERED}, 5417},
     {"&", 1, {DICTIONARY_STOPWORD}, 5383},
     {"sberbank", 1, {DICTIONARY_CHAIN}, -1},
     {"z", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"подарунки", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"пам’ятник", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"каб", 1, {DICTIONARY_UNIT_NUMBERED}, 5412},
     {"соціальнии магазин", 1, {DICTIONARY_PLACE_NAME}, 5358},
     {"південь", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"кв", 1, {DICTIONARY_UNIT_NUMBERED}, 5409},
+    {"вул", 1, {DICTIONARY_STREET_TYPE}, 5408},
     {"продовольчий магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"автомагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"туристична агенція", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"тренажерний зал", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"doroha", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"ш", 1, {DICTIONARY_STREET_TYPE}, 5404},
     {"клініка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"культова споруда", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"д", 1, {DICTIONARY_HOUSE_NUMBER}, 5318},
@@ -84527,9 +84529,9 @@ address_expansion_rule_t expansion_rules[] = {
     {"стоматологія", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"аудіо техніка", 1, {DICTIONARY_PLACE_NAME}, 5362},
     {"крематорій", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"літера", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"proyizd", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"професора", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"торгівельно розважальний центр", 1, {DICTIONARY_PLACE_NAME}, 5364},
-    {"раион", 1, {DICTIONARY_QUALIFIER}, -1},
     {"парк", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"проспект", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ветлікарня", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -84539,23 +84541,25 @@ address_expansion_rule_t expansion_rules[] = {
     {"tut", 1, {DICTIONARY_NEAR}, -1},
     {"амбасада", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"&", 1, {DICTIONARY_STOPWORD}, 5384},
+    {"к-т", 1, {DICTIONARY_UNIT_NUMBERED}, 5412},
     {"v", 1, {DICTIONARY_NEAR}, -1},
     {"blok", 1, {DICTIONARY_QUALIFIER}, -1},
     {"poruch", 1, {DICTIONARY_NEAR}, -1},
-    {"linya", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"dor", 1, {DICTIONARY_STREET_TYPE}, 5391},
     {"lin", 1, {DICTIONARY_STREET_TYPE}, 5402},
     {"мерія", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"k", 1, {DICTIONARY_UNIT_NUMBERED}, 5412},
-    {"kv", 1, {DICTIONARY_UNIT_NUMBERED}, 5410},
+    {"k", 1, {DICTIONARY_UNIT_NUMBERED}, 5413},
     {"i", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
     {"pidval", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
+    {"km", 1, {DICTIONARY_UNIT_NUMBERED}, 5415},
     {"мобільні телефони", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"с", 1, {DICTIONARY_DIRECTIONAL}, 5310},
+    {"область", 1, {DICTIONARY_QUALIFIER}, -1},
     {"храм", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"kvartal", 1, {DICTIONARY_QUALIFIER}, -1},
     {"ploshcha", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"гостьовий будинок", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"к", 1, {DICTIONARY_UNIT_NUMBERED}, 5412},
     {"pravo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"цвинтар", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"база відпочинку", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -84563,6 +84567,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"продовольчі товари", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"веломагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"з", 1, {DICTIONARY_DIRECTIONAL}, 5316},
+    {"сержанта", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"місце стоянки для велосипедів", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"торговий центр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"в", 1, {DICTIONARY_NEAR}, -1},
@@ -84585,7 +84590,6 @@ address_expansion_rule_t expansion_rules[] = {
     {"pershyy poverkh", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"тематичний парк", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"академіка", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"tup", 1, {DICTIONARY_STREET_TYPE}, 5406},
     {"пров", 1, {DICTIONARY_STREET_TYPE}, 5394},
     {"privatbank", 1, {DICTIONARY_CHAIN}, -1},
     {"мотоцикли", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -84593,23 +84597,24 @@ address_expansion_rule_t expansion_rules[] = {
     {"башта", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"міні маркет", 1, {DICTIONARY_PLACE_NAME}, 5360},
     {"художній салон", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"архітектора", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"громадський заклад", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"цок пов", 1, {DICTIONARY_LEVEL_BASEMENT}, 5322},
     {"і", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
-    {"км", 1, {DICTIONARY_UNIT_NUMBERED}, 5413},
     {"vulytsya", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"k-t", 1, {DICTIONARY_UNIT_NUMBERED}, 5412},
     {"pid", 1, {DICTIONARY_NEAR}, -1},
     {"бігова доріжка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"офіс", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"поромна станція", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"будинок", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
     {"килими", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"поруч зі мною", 1, {DICTIONARY_NEAR}, -1},
     {"напоі", 1, {DICTIONARY_PLACE_NAME}, 5355},
     {"пральня", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"приватбанк", 1, {DICTIONARY_CHAIN}, -1},
     {"kut", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"sh", 1, {DICTIONARY_STREET_TYPE}, 5405},
     {"у", 1, {DICTIONARY_NEAR}, -1},
     {"дитячии садок", 1, {DICTIONARY_PLACE_NAME}, 5339},
     {"турбаза", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -84629,7 +84634,6 @@ address_expansion_rule_t expansion_rules[] = {
     {"гірський притулок", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"мотель", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"меблі", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"літ", 1, {DICTIONARY_UNIT_NUMBERED}, 5415},
     {"цокольний поверх", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
     {"s", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"торгівельно-розважальний центр", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -84639,11 +84643,13 @@ address_expansion_rule_t expansion_rules[] = {
     {"шосе", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"kv-l", 1, {DICTIONARY_QUALIFIER}, 5378},
     {"alleya", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"vul", 1, {DICTIONARY_STREET_TYPE}, 5408},
+    {"of", 1, {DICTIONARY_UNIT_NUMBERED}, 5419},
+    {"poruch zi mnoyu", 1, {DICTIONARY_NEAR}, -1},
     {"площа", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"міні гольф", 1, {DICTIONARY_PLACE_NAME}, 5349},
     {"skhody", 1, {DICTIONARY_STAIRCASE}, -1},
     {"канцтовари", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"liniia", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"аллея", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"kimnata", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"navkolo", 1, {DICTIONARY_NEAR}, -1},
@@ -84659,6 +84665,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"автомиика", 1, {DICTIONARY_PLACE_NAME}, 5335},
     {"нічний клуб", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"коледж", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"гетьмана", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"супермаркет", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"аптека", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"риба", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -84683,21 +84690,20 @@ address_expansion_rule_t expansion_rules[] = {
     {"укриття", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"blyzko", 1, {DICTIONARY_NEAR}, 5331},
     {"pivd", 1, {DICTIONARY_DIRECTIONAL}, 5315},
-    {"линия", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"літера", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"міськвиконком", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"к", 1, {DICTIONARY_UNIT_NUMBERED}, 5411},
     {"поруч з", 1, {DICTIONARY_NEAR}, -1},
     {"pivden'", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"proyezd", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"lit", 1, {DICTIONARY_UNIT_NUMBERED}, 5417},
     {"nomer", 1, {DICTIONARY_NUMBER}, -1},
     {"кварт", 1, {DICTIONARY_QUALIFIER}, 5377},
+    {"лін", 1, {DICTIONARY_STREET_TYPE}, 5401},
     {"за́мок", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"м'ясо", 1, {DICTIONARY_PLACE_NAME}, 5356},
     {"авто маистерня", 1, {DICTIONARY_PLACE_NAME}, 5357},
     {"shose", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"продовольчии магазин", 1, {DICTIONARY_PLACE_NAME}, 5366},
     {"спортивнии центр", 1, {DICTIONARY_PLACE_NAME}, 5351},
-    {"каб", 1, {DICTIONARY_UNIT_NUMBERED}, 5411},
     {"oschadbank", 1, {DICTIONARY_CHAIN}, -1},
     {"торгівельно розважальнии центр", 1, {DICTIONARY_PLACE_NAME}, 5364},
     {"кут", 1, {DICTIONARY_CROSS_STREET}, -1},
@@ -84709,38 +84715,38 @@ address_expansion_rule_t expansion_rules[] = {
     {"kvart", 1, {DICTIONARY_QUALIFIER}, 5378},
     {"маршала", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"boulevard", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"област", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"nab", 1, {DICTIONARY_STREET_TYPE}, 5393},
     {"автомийка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"пр", 1, {DICTIONARY_STREET_TYPE}, 5398},
     {"пляжнии курорт", 1, {DICTIONARY_PLACE_NAME}, 5347},
-    {"nab", 1, {DICTIONARY_STREET_TYPE}, 5393},
     {"бар", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"аудіо-техніка", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"kab", 1, {DICTIONARY_UNIT_NUMBERED}, 5413},
     {"livo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"к-т", 1, {DICTIONARY_UNIT_NUMBERED}, 5411},
+    {"kabinet", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"бульвар", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"крематоріи", 1, {DICTIONARY_PLACE_NAME}, 5337},
+    {"літ", 1, {DICTIONARY_UNIT_NUMBERED}, 5416},
     {"blvd", 1, {DICTIONARY_STREET_TYPE}, 5389},
     {"комп’ютерна крамниця", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"мистецький центр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"на розі", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"поруч з мною", 1, {DICTIONARY_NEAR}, -1},
     {"vkhid", 1, {DICTIONARY_ENTRANCE}, -1},
+    {"kv", 1, {DICTIONARY_UNIT_NUMBERED}, 5411},
     {"школа", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"казино", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"офіснии будинок", 1, {DICTIONARY_PLACE_NAME}, 5343},
     {"raion", 1, {DICTIONARY_QUALIFIER}, -1},
     {"готель", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"універсам", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"km", 1, {DICTIONARY_UNIT_NUMBERED}, 5414},
+    {"оф", 1, {DICTIONARY_UNIT_NUMBERED}, 5418},
     {"відео", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"страхування", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"туп", 1, {DICTIONARY_STREET_TYPE}, 5406},
     {"газетнии кіоск", 1, {DICTIONARY_PLACE_NAME}, 5365},
     {"офісний будинок", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"абонементна скринька", 1, {DICTIONARY_POST_OFFICE}, -1},
     {"kv", 1, {DICTIONARY_QUALIFIER}, 5378},
-    {"kab", 1, {DICTIONARY_UNIT_NUMBERED}, 5412},
-    {"budnyok", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
     {"хозтовари", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"a / s", 1, {DICTIONARY_POST_OFFICE}, 5374},
     {"просп", 1, {DICTIONARY_STREET_TYPE}, 5399},
@@ -84760,6 +84766,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"гостьовии будинок", 1, {DICTIONARY_PLACE_NAME}, 5370},
     {"bl", 1, {DICTIONARY_QUALIFIER}, 5376},
     {"кв-л", 1, {DICTIONARY_QUALIFIER}, 5377},
+    {"братів", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"дитячий садок", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ліво", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"persh pov", 1, {DICTIONARY_LEVEL_STANDALONE}, 5328},
@@ -84773,18 +84780,23 @@ address_expansion_rule_t expansion_rules[] = {
     {"ферма", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ал", 1, {DICTIONARY_STREET_TYPE}, 5385},
     {"універмаг", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"liniya", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"поблизу", 1, {DICTIONARY_NEAR}, -1},
     {"гавань для екскурсіиних суден", 1, {DICTIONARY_PLACE_NAME}, 5348},
     {"схід", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"тут", 1, {DICTIONARY_NEAR}, -1},
+    {"k-t", 1, {DICTIONARY_UNIT_NUMBERED}, 5413},
     {"с", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"маєток", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"кафе", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"авто майстерня", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"кв", 1, {DICTIONARY_UNIT_NUMBERED}, 5410},
     {"pro", 1, {DICTIONARY_STREET_TYPE}, 5395},
     {"wog", 1, {DICTIONARY_CHAIN}, -1},
+    {"lin", 1, {DICTIONARY_STREET_TYPE}, 5403},
     {"морозиво", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"provulok", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"tupyk", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"prkt", 1, {DICTIONARY_STREET_TYPE}, 5400},
     {"взуття", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"перш пов", 1, {DICTIONARY_LEVEL_STANDALONE}, 5327},
@@ -84816,7 +84828,6 @@ address_expansion_rule_t expansion_rules[] = {
     {"тематичнии парк", 1, {DICTIONARY_PLACE_NAME}, 5372},
     {"соціальний магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"іграшки", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"проезд", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ритуальні послуги", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"кондитерська", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"d", 1, {DICTIONARY_HOUSE_NUMBER}, 5319},
@@ -84827,24 +84838,23 @@ address_expansion_rule_t expansion_rules[] = {
     {"магазин електроніки", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"гуртожиток", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"tsokolʹnyy poverkh", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
+    {"tup", 1, {DICTIONARY_STREET_TYPE}, 5407},
     {"кабінет", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"буд", 1, {DICTIONARY_HOUSE_NUMBER}, 5320},
     {"з", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"студія", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"сад", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"лин", 1, {DICTIONARY_STREET_TYPE}, 5401},
     {"перший поверх", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"blyzʹko", 1, {DICTIONARY_NEAR}, -1},
+    {"лінія", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"будинок престарілих", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"obl", 1, {DICTIONARY_QUALIFIER}, 5380},
     {"d", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"виносна торгівля", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"дитячии маиданчик", 1, {DICTIONARY_PLACE_NAME}, 5350},
-    {"poruch z mnoyu", 1, {DICTIONARY_NEAR}, -1},
     {"генерала", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"пам'ятник", 1, {DICTIONARY_PLACE_NAME}, 5345},
     {"номер", 1, {DICTIONARY_NUMBER}, -1},
-    {"туп", 1, {DICTIONARY_STREET_TYPE}, 5405},
     {"мисливська вежа", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"банкомат", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"pivden", 1, {DICTIONARY_DIRECTIONAL}, 5315},
@@ -84856,8 +84866,6 @@ address_expansion_rule_t expansion_rules[] = {
     {"сад та город", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"підвал", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
     {"суд", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"sh", 1, {DICTIONARY_STREET_TYPE}, 5404},
-    {"lit", 1, {DICTIONARY_UNIT_NUMBERED}, 5416},
     {"пляжний курорт", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"послуги копіювання", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"торгівельно-розважальнии центр", 1, {DICTIONARY_PLACE_NAME}, 5364},
@@ -84869,7 +84877,8 @@ address_expansion_rule_t expansion_rules[] = {
     {"poverkh", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"спортивні товари", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"pr", 1, {DICTIONARY_STREET_TYPE}, 5400},
-    {"вул", 1, {DICTIONARY_STREET_TYPE}, 5407},
+    {"лейтенанта", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"budynok", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
     {"моднии одяг", 1, {DICTIONARY_PLACE_NAME}, 5361},
     {"замок", 1, {DICTIONARY_PLACE_NAME}, 5344},
     {"музика", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -84882,316 +84891,316 @@ address_expansion_rule_t expansion_rules[] = {
     {"روڈ", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ایکسپریس وے", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"سڑک", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"c v", 1, {DICTIONARY_PLACE_NAME}, 5425},
-    {"t t", 1, {DICTIONARY_QUALIFIER}, 5453},
-    {"ds", 1, {DICTIONARY_PLACE_NAME}, 5428},
-    {"vươn quốc gia", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"t p", 1, {DICTIONARY_QUALIFIER}, 5451},
+    {"cv", 1, {DICTIONARY_PLACE_NAME}, 5426},
+    {"t h p t", 1, {DICTIONARY_PLACE_NAME}, 5444},
+    {"t t t m", 1, {DICTIONARY_PLACE_NAME}, 5445},
     {"sân bay quốc tế", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ks", 1, {DICTIONARY_PLACE_NAME}, 5432},
-    {"t l", 1, {DICTIONARY_STREET_TYPE}, 5462},
-    {"p", 1, {DICTIONARY_QUALIFIER}, 5449},
-    {"kdl", 1, {DICTIONARY_PLACE_NAME}, 5430},
-    {"t h c s", 1, {DICTIONARY_PLACE_NAME}, 5442},
-    {"đường hẻm", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"quan", 1, {DICTIONARY_QUALIFIER}, 5451},
+    {"k / s", 1, {DICTIONARY_PLACE_NAME}, 5433},
+    {"c l b", 1, {DICTIONARY_PLACE_NAME}, 5422},
+    {"n h", 1, {DICTIONARY_PLACE_NAME}, 5434},
+    {"nh", 1, {DICTIONARY_PLACE_NAME}, 5434},
+    {"c v", 1, {DICTIONARY_PLACE_NAME}, 5426},
+    {"thanh pho", 1, {DICTIONARY_QUALIFIER}, 5452},
     {"công viên", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"q t", 1, {DICTIONARY_STREET_TYPE}, 5460},
+    {"t h", 1, {DICTIONARY_PLACE_NAME}, 5442},
     {"trung học cơ sở", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"t h", 1, {DICTIONARY_PLACE_NAME}, 5441},
     {"thành phố", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"t x", 1, {DICTIONARY_QUALIFIER}, 5452},
-    {"tt", 1, {DICTIONARY_PLACE_NAME}, 5445},
-    {"n t", 1, {DICTIONARY_PLACE_NAME}, 5435},
-    {"quoc lo", 1, {DICTIONARY_STREET_TYPE}, 5461},
-    {"nha thi dau", 1, {DICTIONARY_PLACE_NAME}, 5434},
-    {"rh", 1, {DICTIONARY_PLACE_NAME}, 5437},
+    {"n t d", 1, {DICTIONARY_PLACE_NAME}, 5435},
+    {"t p", 1, {DICTIONARY_QUALIFIER}, 5452},
     {"nhà thờ", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"quảng trường", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"khu du lich", 1, {DICTIONARY_PLACE_NAME}, 5430},
-    {"duong nho", 1, {DICTIONARY_STREET_TYPE}, 5458},
-    {"duong pho", 1, {DICTIONARY_STREET_TYPE}, 5459},
-    {"th", 1, {DICTIONARY_PLACE_NAME}, 5441},
-    {"s v d", 1, {DICTIONARY_PLACE_NAME}, 5440},
-    {"cong ty", 1, {DICTIONARY_PLACE_NAME}, 5423},
-    {"phường", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"san bay quoc te", 1, {DICTIONARY_PLACE_NAME}, 5438},
-    {"k d l", 1, {DICTIONARY_PLACE_NAME}, 5430},
-    {"cty cp", 1, {DICTIONARY_PLACE_NAME}, 5422},
-    {"can cu khong quan", 1, {DICTIONARY_PLACE_NAME}, 5426},
-    {"vbt", 1, {DICTIONARY_PLACE_NAME}, 5447},
-    {"rap hat", 1, {DICTIONARY_PLACE_NAME}, 5437},
-    {"dai hoc", 1, {DICTIONARY_PLACE_NAME}, 5427},
-    {"khach san", 1, {DICTIONARY_PLACE_NAME}, 5432},
+    {"dai hoc", 1, {DICTIONARY_PLACE_NAME}, 5428},
+    {"ct", 1, {DICTIONARY_STREET_TYPE}, 5455},
+    {"ql", 1, {DICTIONARY_STREET_TYPE}, 5462},
+    {"tp", 1, {DICTIONARY_QUALIFIER}, 5452},
+    {"sb", 1, {DICTIONARY_PLACE_NAME}, 5440},
+    {"q l", 1, {DICTIONARY_STREET_TYPE}, 5462},
+    {"nha tho", 1, {DICTIONARY_PLACE_NAME}, 5436},
+    {"p", 1, {DICTIONARY_QUALIFIER}, 5450},
+    {"d", 1, {DICTIONARY_STREET_TYPE}, 5457},
+    {"tt", 1, {DICTIONARY_PLACE_NAME}, 5446},
+    {"tttm", 1, {DICTIONARY_PLACE_NAME}, 5445},
     {"tiểu học", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"sb", 1, {DICTIONARY_PLACE_NAME}, 5439},
-    {"thanh", 1, {DICTIONARY_PERSONAL_TITLE}, 5419},
+    {"tl", 1, {DICTIONARY_STREET_TYPE}, 5463},
+    {"th", 1, {DICTIONARY_PLACE_NAME}, 5442},
+    {"d s", 1, {DICTIONARY_PLACE_NAME}, 5429},
     {"q", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"cckq", 1, {DICTIONARY_PLACE_NAME}, 5427},
     {"đại học", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"quang truong", 1, {DICTIONARY_STREET_TYPE}, 5460},
-    {"qt", 1, {DICTIONARY_STREET_TYPE}, 5460},
+    {"cong ty co phan", 1, {DICTIONARY_PLACE_NAME}, 5423},
+    {"dh", 1, {DICTIONARY_PLACE_NAME}, 5428},
     {"trung học phổ thông", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"cvvh", 1, {DICTIONARY_PLACE_NAME}, 5424},
-    {"trung tam", 1, {DICTIONARY_PLACE_NAME}, 5445},
-    {"c d", 1, {DICTIONARY_PLACE_NAME}, 5420},
+    {"cong ty", 1, {DICTIONARY_PLACE_NAME}, 5424},
+    {"v q g", 1, {DICTIONARY_PLACE_NAME}, 5449},
+    {"thpt", 1, {DICTIONARY_PLACE_NAME}, 5444},
+    {"trung hoc co so", 1, {DICTIONARY_PLACE_NAME}, 5443},
     {"công ty", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ctcp", 1, {DICTIONARY_PLACE_NAME}, 5422},
+    {"knm", 1, {DICTIONARY_PLACE_NAME}, 5432},
     {"quận", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"vuon quoc gia", 1, {DICTIONARY_PLACE_NAME}, 5448},
-    {"thi tran", 1, {DICTIONARY_QUALIFIER}, 5453},
-    {"khu nghi mat", 1, {DICTIONARY_PLACE_NAME}, 5431},
-    {"knm", 1, {DICTIONARY_PLACE_NAME}, 5431},
-    {"quan", 1, {DICTIONARY_QUALIFIER}, 5450},
+    {"c c k q", 1, {DICTIONARY_PLACE_NAME}, 5427},
+    {"d h", 1, {DICTIONARY_PLACE_NAME}, 5428},
+    {"nt", 1, {DICTIONARY_PLACE_NAME}, 5436},
+    {"vươn quốc gia", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"ks", 1, {DICTIONARY_PLACE_NAME}, 5433},
     {"sân bay", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"n h", 1, {DICTIONARY_PLACE_NAME}, 5433},
-    {"q", 1, {DICTIONARY_QUALIFIER}, 5450},
-    {"pt", 1, {DICTIONARY_PLACE_NAME}, 5436},
+    {"kdl", 1, {DICTIONARY_PLACE_NAME}, 5431},
+    {"s b q t", 1, {DICTIONARY_PLACE_NAME}, 5439},
+    {"t x", 1, {DICTIONARY_QUALIFIER}, 5453},
+    {"cong vien van hoa", 1, {DICTIONARY_PLACE_NAME}, 5425},
     {"thị trấn", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"nha hat", 1, {DICTIONARY_PLACE_NAME}, 5434},
     {"thánh", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"d l", 1, {DICTIONARY_STREET_TYPE}, 5455},
-    {"c v v h", 1, {DICTIONARY_PLACE_NAME}, 5424},
-    {"s b", 1, {DICTIONARY_PLACE_NAME}, 5439},
-    {"n t d", 1, {DICTIONARY_PLACE_NAME}, 5434},
-    {"trung tam thuong mai", 1, {DICTIONARY_PLACE_NAME}, 5444},
-    {"thpt", 1, {DICTIONARY_PLACE_NAME}, 5443},
-    {"tcty", 1, {DICTIONARY_PLACE_NAME}, 5446},
-    {"trung hoc pho thong", 1, {DICTIONARY_PLACE_NAME}, 5443},
-    {"nhà thi đấu", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ql", 1, {DICTIONARY_STREET_TYPE}, 5461},
-    {"duong", 1, {DICTIONARY_STREET_TYPE}, 5456},
-    {"nt", 1, {DICTIONARY_PLACE_NAME}, 5435},
-    {"nha hat", 1, {DICTIONARY_PLACE_NAME}, 5433},
-    {"thcs", 1, {DICTIONARY_PLACE_NAME}, 5442},
-    {"dh", 1, {DICTIONARY_PLACE_NAME}, 5427},
+    {"q t", 1, {DICTIONARY_STREET_TYPE}, 5461},
+    {"san van dong", 1, {DICTIONARY_PLACE_NAME}, 5441},
+    {"đường hẻm", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"phi trong", 1, {DICTIONARY_PLACE_NAME}, 5437},
+    {"quoc lo", 1, {DICTIONARY_STREET_TYPE}, 5462},
+    {"cd", 1, {DICTIONARY_PLACE_NAME}, 5421},
+    {"rh", 1, {DICTIONARY_PLACE_NAME}, 5438},
+    {"cvvh", 1, {DICTIONARY_PLACE_NAME}, 5425},
+    {"khu cong nghiep", 1, {DICTIONARY_PLACE_NAME}, 5430},
+    {"khu du lich", 1, {DICTIONARY_PLACE_NAME}, 5431},
+    {"cty", 1, {DICTIONARY_PLACE_NAME}, 5424},
+    {"t t", 1, {DICTIONARY_PLACE_NAME}, 5446},
+    {"s v d", 1, {DICTIONARY_PLACE_NAME}, 5441},
+    {"vien bao tang", 1, {DICTIONARY_PLACE_NAME}, 5448},
+    {"san bay quoc te", 1, {DICTIONARY_PLACE_NAME}, 5439},
+    {"k d l", 1, {DICTIONARY_PLACE_NAME}, 5431},
     {"trung tâm thương mại", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"d", 1, {DICTIONARY_STREET_TYPE}, 5456},
     {"đường sắt", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"sbqt", 1, {DICTIONARY_PLACE_NAME}, 5438},
-    {"tttm", 1, {DICTIONARY_PLACE_NAME}, 5444},
-    {"cty c p", 1, {DICTIONARY_PLACE_NAME}, 5422},
     {"khu công nghiệp", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"khu cong nghiep", 1, {DICTIONARY_PLACE_NAME}, 5429},
-    {"t h p t", 1, {DICTIONARY_PLACE_NAME}, 5443},
-    {"đường phố", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"t t", 1, {DICTIONARY_PLACE_NAME}, 5445},
-    {"tổng công ty", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"tt", 1, {DICTIONARY_QUALIFIER}, 5453},
-    {"p", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"ph", 1, {DICTIONARY_QUALIFIER}, 5449},
-    {"công trường", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"v q g", 1, {DICTIONARY_PLACE_NAME}, 5448},
-    {"kcn", 1, {DICTIONARY_PLACE_NAME}, 5429},
-    {"tx", 1, {DICTIONARY_QUALIFIER}, 5452},
-    {"trung hoc co so", 1, {DICTIONARY_PLACE_NAME}, 5442},
-    {"cau lac bo", 1, {DICTIONARY_PLACE_NAME}, 5421},
-    {"tp", 1, {DICTIONARY_QUALIFIER}, 5451},
-    {"c c k q", 1, {DICTIONARY_PLACE_NAME}, 5426},
-    {"thi xa", 1, {DICTIONARY_QUALIFIER}, 5452},
-    {"tct", 1, {DICTIONARY_PLACE_NAME}, 5446},
-    {"căn cứ không quân", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"clb", 1, {DICTIONARY_PLACE_NAME}, 5421},
-    {"nha tho", 1, {DICTIONARY_PLACE_NAME}, 5435},
-    {"khách sạn", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"rạp hát", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"duong sat", 1, {DICTIONARY_PLACE_NAME}, 5428},
-    {"svd", 1, {DICTIONARY_PLACE_NAME}, 5440},
-    {"đường nhỏ", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"s b q t", 1, {DICTIONARY_PLACE_NAME}, 5438},
-    {"c t", 1, {DICTIONARY_STREET_TYPE}, 5454},
-    {"d", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"cong vien van hoa", 1, {DICTIONARY_PLACE_NAME}, 5424},
-    {"vqg", 1, {DICTIONARY_PLACE_NAME}, 5448},
-    {"câu lạc bộ ", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"duong hem", 1, {DICTIONARY_STREET_TYPE}, 5457},
-    {"nhà hát", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"dai lo", 1, {DICTIONARY_STREET_TYPE}, 5455},
-    {"san van dong", 1, {DICTIONARY_PLACE_NAME}, 5440},
-    {"t t t m", 1, {DICTIONARY_PLACE_NAME}, 5444},
-    {"cd", 1, {DICTIONARY_PLACE_NAME}, 5420},
-    {"k / s", 1, {DICTIONARY_PLACE_NAME}, 5432},
-    {"c l b", 1, {DICTIONARY_PLACE_NAME}, 5421},
-    {"quốc lộ", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"nh", 1, {DICTIONARY_PLACE_NAME}, 5433},
-    {"viện bảo tàng", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"cty", 1, {DICTIONARY_PLACE_NAME}, 5423},
-    {"phi trong", 1, {DICTIONARY_PLACE_NAME}, 5436},
-    {"cong vien", 1, {DICTIONARY_PLACE_NAME}, 5425},
-    {"thị xã", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"khu du lịch", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"q l", 1, {DICTIONARY_STREET_TYPE}, 5461},
-    {"công viên văn hóa", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"cao đẳng", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ct", 1, {DICTIONARY_STREET_TYPE}, 5454},
-    {"đl", 1, {DICTIONARY_STREET_TYPE}, 5455},
-    {"r h", 1, {DICTIONARY_PLACE_NAME}, 5437},
-    {"phi trường", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"k c n", 1, {DICTIONARY_PLACE_NAME}, 5429},
-    {"d h", 1, {DICTIONARY_PLACE_NAME}, 5427},
-    {"sân vận động", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"v b t", 1, {DICTIONARY_PLACE_NAME}, 5447},
-    {"cv", 1, {DICTIONARY_PLACE_NAME}, 5425},
-    {"tinh lo", 1, {DICTIONARY_STREET_TYPE}, 5462},
-    {"khu nghỉ mát", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"cao dang", 1, {DICTIONARY_PLACE_NAME}, 5420},
-    {"vien bao tang", 1, {DICTIONARY_PLACE_NAME}, 5447},
-    {"đường", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"c t c p", 1, {DICTIONARY_PLACE_NAME}, 5422},
-    {"công ty cổ phần", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"k n m", 1, {DICTIONARY_PLACE_NAME}, 5431},
-    {"tỉnh lộ", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"cong truong", 1, {DICTIONARY_STREET_TYPE}, 5454},
+    {"kcn", 1, {DICTIONARY_PLACE_NAME}, 5430},
+    {"r h", 1, {DICTIONARY_PLACE_NAME}, 5438},
     {"trung tâm", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"thanh pho", 1, {DICTIONARY_QUALIFIER}, 5451},
-    {"ntd", 1, {DICTIONARY_PLACE_NAME}, 5434},
-    {"tl", 1, {DICTIONARY_STREET_TYPE}, 5462},
+    {"khach san", 1, {DICTIONARY_PLACE_NAME}, 5433},
+    {"đường phố", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"đl", 1, {DICTIONARY_STREET_TYPE}, 5456},
+    {"quốc lộ", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"tổng công ty", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"tinh lo", 1, {DICTIONARY_STREET_TYPE}, 5463},
+    {"p", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"cao dang", 1, {DICTIONARY_PLACE_NAME}, 5421},
+    {"c t c p", 1, {DICTIONARY_PLACE_NAME}, 5423},
+    {"k n m", 1, {DICTIONARY_PLACE_NAME}, 5432},
+    {"c d", 1, {DICTIONARY_PLACE_NAME}, 5421},
+    {"tong cong ty", 1, {DICTIONARY_PLACE_NAME}, 5447},
+    {"cong truong", 1, {DICTIONARY_STREET_TYPE}, 5455},
+    {"ctcp", 1, {DICTIONARY_PLACE_NAME}, 5423},
+    {"ntd", 1, {DICTIONARY_PLACE_NAME}, 5435},
+    {"thi tran", 1, {DICTIONARY_QUALIFIER}, 5454},
+    {"dai lo", 1, {DICTIONARY_STREET_TYPE}, 5456},
+    {"căn cứ không quân", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"tỉnh lộ", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"tieu hoc", 1, {DICTIONARY_PLACE_NAME}, 5442},
+    {"tt", 1, {DICTIONARY_QUALIFIER}, 5454},
+    {"rạp hát", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"n t", 1, {DICTIONARY_PLACE_NAME}, 5436},
+    {"ph", 1, {DICTIONARY_QUALIFIER}, 5450},
+    {"p t", 1, {DICTIONARY_PLACE_NAME}, 5437},
+    {"đường nhỏ", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"d", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"q", 1, {DICTIONARY_QUALIFIER}, 5451},
+    {"pt", 1, {DICTIONARY_PLACE_NAME}, 5437},
+    {"câu lạc bộ ", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"nhà hát", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"ds", 1, {DICTIONARY_PLACE_NAME}, 5429},
+    {"clb", 1, {DICTIONARY_PLACE_NAME}, 5422},
+    {"khu nghi mat", 1, {DICTIONARY_PLACE_NAME}, 5432},
+    {"c v v h", 1, {DICTIONARY_PLACE_NAME}, 5425},
+    {"nhà thi đấu", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"d l", 1, {DICTIONARY_STREET_TYPE}, 5456},
+    {"t l", 1, {DICTIONARY_STREET_TYPE}, 5463},
+    {"trung tam thuong mai", 1, {DICTIONARY_PLACE_NAME}, 5445},
+    {"tcty", 1, {DICTIONARY_PLACE_NAME}, 5447},
+    {"t h c s", 1, {DICTIONARY_PLACE_NAME}, 5443},
+    {"công trường", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"viện bảo tàng", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"duong", 1, {DICTIONARY_STREET_TYPE}, 5457},
+    {"k c n", 1, {DICTIONARY_PLACE_NAME}, 5430},
+    {"nha thi dau", 1, {DICTIONARY_PLACE_NAME}, 5435},
+    {"duong hem", 1, {DICTIONARY_STREET_TYPE}, 5458},
+    {"v b t", 1, {DICTIONARY_PLACE_NAME}, 5448},
+    {"thanh", 1, {DICTIONARY_PERSONAL_TITLE}, 5420},
+    {"khu du lịch", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"thcs", 1, {DICTIONARY_PLACE_NAME}, 5443},
+    {"công viên văn hóa", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"sbqt", 1, {DICTIONARY_PLACE_NAME}, 5439},
+    {"quang truong", 1, {DICTIONARY_STREET_TYPE}, 5461},
+    {"cty c p", 1, {DICTIONARY_PLACE_NAME}, 5423},
+    {"khách sạn", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"vbt", 1, {DICTIONARY_PLACE_NAME}, 5448},
+    {"phi trường", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"vqg", 1, {DICTIONARY_PLACE_NAME}, 5449},
+    {"thị xã", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"sân vận động", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"phường", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"cong vien", 1, {DICTIONARY_PLACE_NAME}, 5426},
+    {"duong nho", 1, {DICTIONARY_STREET_TYPE}, 5459},
+    {"khu nghỉ mát", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"quảng trường", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"đường", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"cty cp", 1, {DICTIONARY_PLACE_NAME}, 5423},
+    {"can cu khong quan", 1, {DICTIONARY_PLACE_NAME}, 5427},
+    {"rap hat", 1, {DICTIONARY_PLACE_NAME}, 5438},
+    {"tx", 1, {DICTIONARY_QUALIFIER}, 5453},
+    {"trung hoc pho thong", 1, {DICTIONARY_PLACE_NAME}, 5444},
+    {"cau lac bo", 1, {DICTIONARY_PLACE_NAME}, 5422},
+    {"t t", 1, {DICTIONARY_QUALIFIER}, 5454},
+    {"san bay", 1, {DICTIONARY_PLACE_NAME}, 5440},
+    {"thi xa", 1, {DICTIONARY_QUALIFIER}, 5453},
     {"đại lộ", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"d s", 1, {DICTIONARY_PLACE_NAME}, 5428},
+    {"tct", 1, {DICTIONARY_PLACE_NAME}, 5447},
+    {"vuon quoc gia", 1, {DICTIONARY_PLACE_NAME}, 5449},
     {"ngõ", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"tieu hoc", 1, {DICTIONARY_PLACE_NAME}, 5441},
-    {"cckq", 1, {DICTIONARY_PLACE_NAME}, 5426},
-    {"cong ty co phan", 1, {DICTIONARY_PLACE_NAME}, 5422},
-    {"san bay", 1, {DICTIONARY_PLACE_NAME}, 5439},
-    {"p t", 1, {DICTIONARY_PLACE_NAME}, 5436},
-    {"tong cong ty", 1, {DICTIONARY_PLACE_NAME}, 5446},
+    {"c t", 1, {DICTIONARY_STREET_TYPE}, 5455},
+    {"duong pho", 1, {DICTIONARY_STREET_TYPE}, 5460},
+    {"duong sat", 1, {DICTIONARY_PLACE_NAME}, 5429},
+    {"qt", 1, {DICTIONARY_STREET_TYPE}, 5461},
+    {"svd", 1, {DICTIONARY_PLACE_NAME}, 5441},
+    {"cao đẳng", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"công ty cổ phần", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"s b", 1, {DICTIONARY_PLACE_NAME}, 5440},
+    {"trung tam", 1, {DICTIONARY_PLACE_NAME}, 5446},
+    {"xiandao", 1, {DICTIONARY_STREET_TYPE}, 5502},
     {"栋", 1, {DICTIONARY_BUILDING_TYPE}, -1},
     {"duàn", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"shengdao", 1, {DICTIONARY_STREET_TYPE}, 5500},
-    {"xiàn dào", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"xibei", 1, {DICTIONARY_DIRECTIONAL}, 5468},
+    {"hao", 1, {DICTIONARY_NUMBER}, 5479},
+    {"guodao", 1, {DICTIONARY_STREET_TYPE}, 5497},
+    {"xiang dao", 1, {DICTIONARY_STREET_TYPE}, 5504},
     {"邮编", 1, {DICTIONARY_POSTAL_CODE}, -1},
     {"胡同", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"大街", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"lù", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"zhen", 1, {DICTIONARY_QUALIFIER}, 5487},
     {"街", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"shěngdào", 1, {DICTIONARY_STREET_TYPE}, 5500},
-    {"xiangdao", 1, {DICTIONARY_STREET_TYPE}, 5503},
+    {"bei", 1, {DICTIONARY_DIRECTIONAL}, 5465},
     {"縣", 1, {DICTIONARY_QUALIFIER}, -1},
     {"xiàn", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"xi nan", 1, {DICTIONARY_DIRECTIONAL}, 5472},
+    {"xiang", 1, {DICTIONARY_STREET_TYPE}, 5503},
     {"鄉", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"dong bei", 1, {DICTIONARY_DIRECTIONAL}, 5473},
+    {"xiangdao", 1, {DICTIONARY_STREET_TYPE}, 5504},
     {"nán", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"xian", 1, {DICTIONARY_QUALIFIER}, 5483},
     {"xī běi", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"lǐ", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"youbian", 1, {DICTIONARY_POSTAL_CODE}, 5481},
-    {"lou", 1, {DICTIONARY_LEVEL_NUMBERED}, 5476},
-    {"qiao", 1, {DICTIONARY_PLACE_NAME}, 5479},
+    {"北", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"cun", 1, {DICTIONARY_QUALIFIER}, 5490},
     {"邮政信箱", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"xiang dao", 1, {DICTIONARY_STREET_TYPE}, 5503},
-    {"dàjiē", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"xiang", 1, {DICTIONARY_QUALIFIER}, 5487},
-    {"dongnan", 1, {DICTIONARY_DIRECTIONAL}, 5474},
+    {"duan", 1, {DICTIONARY_STREET_TYPE}, 5505},
+    {"shengdao", 1, {DICTIONARY_STREET_TYPE}, 5501},
+    {"xiang", 1, {DICTIONARY_QUALIFIER}, 5488},
+    {"dong bei", 1, {DICTIONARY_DIRECTIONAL}, 5474},
+    {"li", 1, {DICTIONARY_QUALIFIER}, 5489},
     {"鄰", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"xi bei", 1, {DICTIONARY_DIRECTIONAL}, 5470},
     {"桥", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"大院", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"shěng", 1, {DICTIONARY_QUALIFIER}, -1},
     {"道", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"cūndào", 1, {DICTIONARY_STREET_TYPE}, 5491},
-    {"dayuan", 1, {DICTIONARY_STREET_TYPE}, 5495},
+    {"lu", 1, {DICTIONARY_STREET_TYPE}, 5500},
+    {"dong", 1, {DICTIONARY_BUILDING_TYPE}, 5464},
     {"楼", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"sheng", 1, {DICTIONARY_QUALIFIER}, 5482},
+    {"lin", 1, {DICTIONARY_QUALIFIER}, 5491},
+    {"qu", 1, {DICTIONARY_QUALIFIER}, 5486},
     {"国道", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"dōngnán", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"qū", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"县道", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"xi bei", 1, {DICTIONARY_DIRECTIONAL}, 5469},
-    {"xi", 1, {DICTIONARY_DIRECTIONAL}, 5467},
+    {"dayuan", 1, {DICTIONARY_STREET_TYPE}, 5496},
     {"zhèn", 1, {DICTIONARY_QUALIFIER}, -1},
     {"shěng dào", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"村", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"hao", 1, {DICTIONARY_NUMBER}, 5478},
+    {"鎮", 1, {DICTIONARY_QUALIFIER}, -1},
     {"xīběi", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"guodao", 1, {DICTIONARY_STREET_TYPE}, 5496},
-    {"lu", 1, {DICTIONARY_STREET_TYPE}, 5499},
+    {"xiàndào", 1, {DICTIONARY_STREET_TYPE}, 5502},
+    {"xibei", 1, {DICTIONARY_DIRECTIONAL}, 5469},
     {"dào", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"céng", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"西", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"里", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"zhen", 1, {DICTIONARY_QUALIFIER}, 5486},
+    {"dàjiē", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"樓", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
+    {"xiàn dào", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"hào", 2, {DICTIONARY_NUMBER, DICTIONARY_STOPWORD}, -1},
-    {"bei", 1, {DICTIONARY_DIRECTIONAL}, 5464},
+    {"shěngdào", 1, {DICTIONARY_STREET_TYPE}, 5501},
     {"dàdào", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"cūn", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"路", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"xiāngdào", 1, {DICTIONARY_STREET_TYPE}, 5503},
-    {"shi", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT_NUMBERED}, 5484},
+    {"xinan", 1, {DICTIONARY_DIRECTIONAL}, 5471},
     {"郵編", 1, {DICTIONARY_POSTAL_CODE}, -1},
     {"西南", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"路", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"號", 1, {DICTIONARY_NUMBER}, -1},
-    {"yóubiān", 1, {DICTIONARY_POSTAL_CODE}, -1},
+    {"youbian", 1, {DICTIONARY_POSTAL_CODE}, 5482},
     {"东北", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"cun", 1, {DICTIONARY_QUALIFIER}, 5489},
+    {"nong", 1, {DICTIONARY_STREET_TYPE}, 5506},
     {"东", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"段", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"sheng dao", 1, {DICTIONARY_STREET_TYPE}, 5501},
     {"qiáo", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"jiē", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"dajie", 1, {DICTIONARY_STREET_TYPE}, 5493},
-    {"xian dao", 1, {DICTIONARY_STREET_TYPE}, 5501},
     {"dōng běi", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"li", 1, {DICTIONARY_QUALIFIER}, 5488},
-    {"xiandao", 1, {DICTIONARY_STREET_TYPE}, 5501},
-    {"youzheng xinxiang", 1, {DICTIONARY_POST_OFFICE}, 5480},
+    {"dongnan", 1, {DICTIONARY_DIRECTIONAL}, 5475},
     {"西北", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"yóubiān", 1, {DICTIONARY_POSTAL_CODE}, -1},
     {"巷", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"dajie", 1, {DICTIONARY_STREET_TYPE}, 5494},
     {"东南", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"dadao", 1, {DICTIONARY_STREET_TYPE}, 5492},
     {"南", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"室", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"dong", 1, {DICTIONARY_DIRECTIONAL}, 5465},
     {"xiāng dào", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"hutong", 1, {DICTIONARY_STREET_TYPE}, 5497},
+    {"shi", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT_NUMBERED}, 5485},
+    {"sheng", 1, {DICTIONARY_QUALIFIER}, 5483},
     {"xī", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"萊爾富", 1, {DICTIONARY_CHAIN}, -1},
+    {"dao", 1, {DICTIONARY_STREET_TYPE}, 5495},
     {"guódào", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"sheng dao", 1, {DICTIONARY_STREET_TYPE}, 5500},
+    {"jie", 1, {DICTIONARY_STREET_TYPE}, 5499},
+    {"县道", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"xīnán", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"dōngběi", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"nan", 1, {DICTIONARY_DIRECTIONAL}, 5466},
-    {"cun dao", 1, {DICTIONARY_STREET_TYPE}, 5491},
-    {"北", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"xinan", 1, {DICTIONARY_DIRECTIONAL}, 5470},
+    {"dong", 1, {DICTIONARY_DIRECTIONAL}, 5466},
+    {"dongbei", 1, {DICTIONARY_DIRECTIONAL}, 5473},
+    {"lǐ", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"ceng", 1, {DICTIONARY_LEVEL_NUMBERED}, 5478},
+    {"乡道", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"cundao", 1, {DICTIONARY_STREET_TYPE}, 5492},
     {"běi", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"hútòng", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"省", 1, {DICTIONARY_QUALIFIER}, -1},
     {"号", 2, {DICTIONARY_NUMBER, DICTIONARY_STOPWORD}, -1},
-    {"nong", 1, {DICTIONARY_STREET_TYPE}, 5505},
+    {"村道", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"qiao", 1, {DICTIONARY_PLACE_NAME}, 5480},
     {"yóuzhèng xìnxiāng", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"xiang", 1, {DICTIONARY_STREET_TYPE}, 5502},
-    {"dong", 1, {DICTIONARY_BUILDING_TYPE}, 5463},
+    {"xiāngdào", 1, {DICTIONARY_STREET_TYPE}, 5504},
+    {"段", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"xian dao", 1, {DICTIONARY_STREET_TYPE}, 5502},
+    {"hutong", 1, {DICTIONARY_STREET_TYPE}, 5498},
     {"dòng", 1, {DICTIONARY_BUILDING_TYPE}, -1},
-    {"lin", 1, {DICTIONARY_QUALIFIER}, 5490},
     {"dōng", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"lín", 1, {DICTIONARY_QUALIFIER}, -1},
     {"xiàng", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"乡道", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"lou", 1, {DICTIONARY_LEVEL_NUMBERED}, 5477},
+    {"cun dao", 1, {DICTIONARY_STREET_TYPE}, 5492},
     {"全家便利商店", 1, {DICTIONARY_CHAIN}, -1},
-    {"dong nan", 1, {DICTIONARY_DIRECTIONAL}, 5475},
+    {"youzheng xinxiang", 1, {DICTIONARY_POST_OFFICE}, 5481},
     {"层", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"duan", 1, {DICTIONARY_STREET_TYPE}, 5504},
-    {"cundao", 1, {DICTIONARY_STREET_TYPE}, 5491},
-    {"xiàndào", 1, {DICTIONARY_STREET_TYPE}, 5501},
+    {"dadao", 1, {DICTIONARY_STREET_TYPE}, 5493},
     {"省道", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"大道", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"dà yuàn", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"弄", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"dongbei", 1, {DICTIONARY_DIRECTIONAL}, 5472},
-    {"dao", 1, {DICTIONARY_STREET_TYPE}, 5494},
+    {"dong nan", 1, {DICTIONARY_DIRECTIONAL}, 5476},
     {"dōng nán", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"jie", 1, {DICTIONARY_STREET_TYPE}, 5498},
+    {"xi", 1, {DICTIONARY_DIRECTIONAL}, 5468},
     {"xī nán", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"區", 1, {DICTIONARY_QUALIFIER}, -1},
     {"cūn dào", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"lóu", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
+    {"cūndào", 1, {DICTIONARY_STREET_TYPE}, 5492},
     {"shì", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT_NUMBERED}, -1},
-    {"xi nan", 1, {DICTIONARY_DIRECTIONAL}, 5471},
-    {"村道", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"nan", 1, {DICTIONARY_DIRECTIONAL}, 5467},
+    {"xian", 1, {DICTIONARY_QUALIFIER}, 5484},
     {"nòng", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"市", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"ceng", 1, {DICTIONARY_LEVEL_NUMBERED}, 5477},
-    {"qu", 1, {DICTIONARY_QUALIFIER}, 5485},
     {"xiāng", 1, {DICTIONARY_QUALIFIER}, -1},
     {"区", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"鎮", 1, {DICTIONARY_QUALIFIER}, -1},
     {"郵政信箱", 1, {DICTIONARY_POST_OFFICE}, -1}
 };
 
@@ -85253,8 +85262,8 @@ address_language_index_t expansion_languages[] = {
     {"sv", 78586, 240},
     {"th", 78826, 23},
     {"tr", 78849, 98},
-    {"uk", 78947, 419},
-    {"ur", 79366, 7},
-    {"vi", 79373, 170},
-    {"zh", 79543, 141}
+    {"uk", 78947, 427},
+    {"ur", 79374, 7},
+    {"vi", 79381, 170},
+    {"zh", 79551, 141}
 };