diff --git a/src/address_expansion_data.c b/src/address_expansion_data.c
index ef22b092..6cf1d6bf 100644
--- a/src/address_expansion_data.c
+++ b/src/address_expansion_data.c
@@ -4055,6 +4055,7 @@ char *canonical_strings[] = {
     "kade",
     "plein",
     "plantsoen",
+    "groot",
     "kleine",
     "links",
     "rechts",
@@ -4062,6 +4063,7 @@ char *canonical_strings[] = {
     "bus",
     "carrièra",
     "plaça",
+    "santa",
     "adwokat",
     "budowa",
     "żabka",
@@ -4606,6 +4608,7 @@ char *canonical_strings[] = {
     "nizhniy etazh",
     "ryadom zdes'",
     "zdes'",
+    "без номера",
     "номер",
     "nomer",
     "генерала",
@@ -4656,6 +4659,8 @@ char *canonical_strings[] = {
     "домик для гостей",
     "музей",
     "abonementnykh skrynʹka",
+    "агрогородок",
+    "agrogorodok",
     "деревня",
     "derevnya",
     "гмина",
@@ -4669,10 +4674,16 @@ char *canonical_strings[] = {
     "ostrov",
     "город",
     "gorod",
+    "городской посёлок ",
+    "gorodskoy posolok",
     "раион",
     "raion",
+    "сельский совет",
+    "sel'skiy sovet",
     "посёлок",
-    "poselok",
+    "posolok",
+    "посёлок городско́го ти́па",
+    "posolok gorodskógo típa",
     "аллея",
     "alleya",
     "бульвар",
@@ -30354,6 +30365,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"Šantić", 1, {DICTIONARY_SURNAME}, -1},
     {"Shonekan", 1, {DICTIONARY_SURNAME}, -1},
     {"Cluett", 1, {DICTIONARY_SURNAME}, -1},
+    {"Misimović", 1, {DICTIONARY_SURNAME}, -1},
     {"Hajdari", 1, {DICTIONARY_SURNAME}, -1},
     {"Dannelly", 1, {DICTIONARY_SURNAME}, -1},
     {"Daniélou", 1, {DICTIONARY_SURNAME}, -1},
@@ -40438,6 +40450,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"Sybrand", 1, {DICTIONARY_GIVEN_NAME}, -1},
     {"Sandbichler", 1, {DICTIONARY_SURNAME}, -1},
     {"Núria", 1, {DICTIONARY_GIVEN_NAME}, -1},
+    {"m l k j", 1, {DICTIONARY_NAMED_PERSON}, 282},
     {"Drusilla", 1, {DICTIONARY_GIVEN_NAME}, -1},
     {"McGarry", 1, {DICTIONARY_SURNAME}, -1},
     {"Shafiqullah", 1, {DICTIONARY_GIVEN_NAME}, -1},
@@ -48249,6 +48262,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"Geno", 1, {DICTIONARY_GIVEN_NAME}, -1},
     {"Vaccarezza", 1, {DICTIONARY_SURNAME}, -1},
     {"Septimus", 1, {DICTIONARY_GIVEN_NAME}, -1},
+    {"mlk jr", 1, {DICTIONARY_NAMED_PERSON}, 282},
     {"Ulfeldt", 1, {DICTIONARY_SURNAME}, -1},
     {"Joon", 1, {DICTIONARY_SURNAME}, -1},
     {"Hovland", 1, {DICTIONARY_SURNAME}, -1},
@@ -56132,6 +56146,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"Radača", 1, {DICTIONARY_SURNAME}, -1},
     {"Prechtel", 1, {DICTIONARY_SURNAME}, -1},
     {"Hasemi", 1, {DICTIONARY_SURNAME}, -1},
+    {"m l k jr", 1, {DICTIONARY_NAMED_PERSON}, 282},
     {"Harkins", 1, {DICTIONARY_SURNAME}, -1},
     {"Reddiar", 1, {DICTIONARY_SURNAME}, -1},
     {"Togawa", 1, {DICTIONARY_SURNAME}, -1},
@@ -59574,7 +59589,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"Borel", 1, {DICTIONARY_SURNAME}, -1},
     {"Schafhausen", 1, {DICTIONARY_SURNAME}, -1},
     {"Modjeska", 2, {DICTIONARY_GIVEN_NAME, DICTIONARY_SURNAME}, -1},
-    {"Misimović", 1, {DICTIONARY_SURNAME}, -1},
+    {"mlk j", 1, {DICTIONARY_NAMED_PERSON}, 282},
     {"Virtala", 1, {DICTIONARY_SURNAME}, -1},
     {"Yule", 1, {DICTIONARY_SURNAME}, -1},
     {"Hofbauer", 1, {DICTIONARY_SURNAME}, -1},
@@ -69445,6 +69460,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"me", 1, {DICTIONARY_TOPONYM}, 1781},
     {"municipal bldg", 1, {DICTIONARY_PLACE_NAME}, 1310},
     {"vermont", 1, {DICTIONARY_TOPONYM}, -1},
+    {"bl", 1, {DICTIONARY_STREET_TYPE}, 1397},
     {"whf", 1, {DICTIONARY_STREET_TYPE}, 1716},
     {"t.l", 1, {DICTIONARY_UNIT_STANDALONE}, 1868},
     {"vst", 1, {DICTIONARY_STREET_TYPE}, 1708},
@@ -72444,6 +72460,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"cía", 1, {DICTIONARY_COMPANY_TYPE}, 1892},
     {"nro", 1, {DICTIONARY_NUMBER}, 1976},
     {"# ext", 1, {DICTIONARY_HOUSE_NUMBER}, 1957},
+    {"dep", 1, {DICTIONARY_UNIT_NUMBERED}, 2455},
     {"alqueria", 1, {DICTIONARY_STREET_TYPE}, 2269},
     {"& cia sc", 1, {DICTIONARY_COMPANY_TYPE}, 1914},
     {"exc.a", 1, {DICTIONARY_PERSONAL_TITLE}, 2024},
@@ -79140,6 +79157,8 @@ address_expansion_rule_t expansion_rules[] = {
     {"of", 1, {DICTIONARY_STOPWORD}, -1},
     {"super markt", 1, {DICTIONARY_PLACE_NAME}, 4038},
     {"w", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"kl", 1, {DICTIONARY_SYNONYM}, 4056},
+    {"grt", 1, {DICTIONARY_SYNONYM}, 4055},
     {"univ", 1, {DICTIONARY_PLACE_NAME}, 4039},
     {"noord", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"hem", 1, {DICTIONARY_STOPWORD}, -1},
@@ -79155,7 +79174,6 @@ address_expansion_rule_t expansion_rules[] = {
     {"vd", 1, {DICTIONARY_STOPWORD}, 4046},
     {"zuid oosten", 1, {DICTIONARY_DIRECTIONAL}, 3994},
     {"zuidzijde", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"app", 1, {DICTIONARY_UNIT_NUMBERED}, 4058},
     {"zo", 1, {DICTIONARY_DIRECTIONAL}, 3994},
     {"mkt plein", 1, {DICTIONARY_PLACE_NAME}, 4036},
     {"school", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -79246,14 +79264,12 @@ address_expansion_rule_t expansion_rules[] = {
     {"nabij", 1, {DICTIONARY_NEAR}, -1},
     {"korte", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"past", 1, {DICTIONARY_PERSONAL_TITLE}, 4026},
-    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4058},
     {"zw", 1, {DICTIONARY_DIRECTIONAL}, 3996},
     {"aan", 1, {DICTIONARY_STOPWORD}, -1},
     {"westzijde", 1, {DICTIONARY_QUALIFIER}, -1},
     {"hoe", 1, {DICTIONARY_STOPWORD}, -1},
     {"auditorium", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"zou", 1, {DICTIONARY_STOPWORD}, -1},
-    {"l", 1, {DICTIONARY_UNIT_DIRECTION}, 4056},
     {"onze lieve vrouwe", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"universiteit", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"v d", 1, {DICTIONARY_STOPWORD}, 4047},
@@ -79290,7 +79306,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"veerterminal", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"kamer", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"no", 1, {DICTIONARY_DIRECTIONAL}, 3986},
-    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4058},
+    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4059},
     {"zuster", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"kte", 1, {DICTIONARY_PERSONAL_TITLE}, 4016},
     {"generaal", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
@@ -79348,6 +79364,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"o l v", 1, {DICTIONARY_PERSONAL_TITLE}, 4025},
     {"winkel", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"openbare markt", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"r", 1, {DICTIONARY_UNIT_DIRECTION}, 4058},
     {"marktplein", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"gr.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3970},
     {"kliniek", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -79375,6 +79392,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"v", 1, {DICTIONARY_STOPWORD}, 4045},
     {"o.z.", 1, {DICTIONARY_QUALIFIER}, 4041},
     {"uit", 1, {DICTIONARY_STOPWORD}, -1},
+    {"b", 1, {DICTIONARY_UNIT_NUMBERED}, 4060},
     {"fitnesscentrum", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"loane", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"westelijke", 1, {DICTIONARY_DIRECTIONAL}, -1},
@@ -79384,6 +79402,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"vrouwe", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"noordelijke", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"meester", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"app", 1, {DICTIONARY_UNIT_NUMBERED}, 4059},
     {"mej", 1, {DICTIONARY_PERSONAL_TITLE}, 4021},
     {"rechtbank", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"cinema", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -79391,11 +79410,11 @@ address_expansion_rule_t expansion_rules[] = {
     {"prins", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"zij", 1, {DICTIONARY_STOPWORD}, -1},
     {"zuidoost", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"groot", 1, {DICTIONARY_SYNONYM}, -1},
     {"vd", 1, {DICTIONARY_STOPWORD}, 4047},
     {"oz", 1, {DICTIONARY_QUALIFIER}, 4041},
     {"pk", 1, {DICTIONARY_STREET_TYPE}, 3969},
     {"noordwesten", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"kl", 1, {DICTIONARY_SYNONYM}, 4055},
     {"ln.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3972},
     {"studio", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"benedenverdiep", 1, {DICTIONARY_LEVEL_STANDALONE}, 4002},
@@ -79418,6 +79437,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"sauna", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"z.w", 1, {DICTIONARY_DIRECTIONAL}, 3996},
     {"verdieping", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
+    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4059},
     {"kolonel", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"tussen", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"k", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
@@ -79428,6 +79448,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"bibliotheek", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"markt plein", 1, {DICTIONARY_PLACE_NAME}, 4036},
     {"zuiden", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"l", 1, {DICTIONARY_UNIT_DIRECTION}, 4057},
     {"kard", 1, {DICTIONARY_PERSONAL_TITLE}, 4014},
     {"zuid oost", 1, {DICTIONARY_DIRECTIONAL}, 3993},
     {"z.w", 1, {DICTIONARY_DIRECTIONAL}, 3995},
@@ -79454,7 +79475,6 @@ address_expansion_rule_t expansion_rules[] = {
     {"bar", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"kon", 1, {DICTIONARY_PERSONAL_TITLE}, 4017},
     {"oostelijke", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"r", 1, {DICTIONARY_UNIT_DIRECTION}, 4057},
     {"hof", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
     {"fietsverhuur", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"kantoor", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -79482,1875 +79502,1887 @@ address_expansion_rule_t expansion_rules[] = {
     {"te", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
     {"wg", 1, {DICTIONARY_STREET_TYPE}, 3982},
     {"begane gro", 1, {DICTIONARY_LEVEL_STANDALONE}, 4001},
-    {"b", 1, {DICTIONARY_UNIT_NUMBERED}, 4059},
     {"mejuffrouw", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"huis", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ziekenhuis", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"peuterspeelzaal", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"apotheek", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"plç", 1, {DICTIONARY_STREET_TYPE}, 4061},
     {"carrièra", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"plc", 1, {DICTIONARY_STREET_TYPE}, 4061},
     {"dera", 1, {DICTIONARY_STOPWORD}, -1},
     {"deu", 1, {DICTIONARY_STOPWORD}, -1},
     {"a", 1, {DICTIONARY_STOPWORD}, -1},
     {"dei", 1, {DICTIONARY_STOPWORD}, -1},
     {"del", 1, {DICTIONARY_STOPWORD}, -1},
-    {"pl", 1, {DICTIONARY_STREET_TYPE}, 4061},
+    {"plc", 1, {DICTIONARY_STREET_TYPE}, 4062},
+    {"pça", 1, {DICTIONARY_STREET_TYPE}, 4062},
     {"lo", 1, {DICTIONARY_STOPWORD}, -1},
     {"l'", 1, {DICTIONARY_ELISION}, -1},
     {"e", 1, {DICTIONARY_STOPWORD}, -1},
     {"et", 1, {DICTIONARY_STOPWORD}, -1},
     {"deus", 1, {DICTIONARY_STOPWORD}, -1},
-    {"placa", 1, {DICTIONARY_STREET_TYPE}, 4061},
+    {"plç", 1, {DICTIONARY_STREET_TYPE}, 4062},
+    {"carriera", 1, {DICTIONARY_STREET_TYPE}, 4061},
     {"pas", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"camin", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pça", 1, {DICTIONARY_STREET_TYPE}, 4061},
+    {"pca", 1, {DICTIONARY_STREET_TYPE}, 4062},
+    {"pl", 1, {DICTIONARY_STREET_TYPE}, 4062},
     {"avenguda", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"de", 1, {DICTIONARY_STOPWORD}, -1},
-    {"carriera", 1, {DICTIONARY_STREET_TYPE}, 4060},
+    {"placa", 1, {DICTIONARY_STREET_TYPE}, 4062},
     {"dal", 1, {DICTIONARY_STOPWORD}, -1},
     {"la", 1, {DICTIONARY_STOPWORD}, -1},
     {"plaça", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"al", 1, {DICTIONARY_STOPWORD}, -1},
     {"las", 1, {DICTIONARY_STOPWORD}, -1},
-    {"pca", 1, {DICTIONARY_STREET_TYPE}, 4061},
     {"san", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"sta", 1, {DICTIONARY_PERSONAL_TITLE}, 4063},
     {"kaya", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"kaminda", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"santa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4099},
-    {"ośr", 1, {DICTIONARY_PLACE_NAME}, 4161},
-    {"płd", 1, {DICTIONARY_DIRECTIONAL}, 4074},
-    {"mn", 1, {DICTIONARY_PLACE_NAME}, 4157},
+    {"w", 1, {DICTIONARY_DIRECTIONAL}, 4075},
+    {"pn.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4073},
     {"muzeum", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"pld wsch", 1, {DICTIONARY_DIRECTIONAL}, 4077},
+    {"strz", 1, {DICTIONARY_PERSONAL_TITLE}, 4138},
     {"pułkownik", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pn-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4071},
     {"magister", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"południowy wschód", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"płk", 1, {DICTIONARY_PERSONAL_TITLE}, 4128},
-    {"al", 1, {DICTIONARY_STREET_TYPE}, 4175},
-    {"№", 1, {DICTIONARY_NUMBER}, 4087},
     {"droga", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"st", 1, {DICTIONARY_SYNONYM}, 4197},
     {"departament", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"pld-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4075},
     {"dyrektor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pld.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4076},
     {"hotel", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"komandor porucznik", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sen", 1, {DICTIONARY_PERSONAL_TITLE}, 4133},
-    {"dln", 1, {DICTIONARY_SYNONYM}, 4186},
-    {"organ", 1, {DICTIONARY_PLACE_NAME}, 4160},
+    {"gen dyw", 1, {DICTIONARY_PERSONAL_TITLE}, 4108},
+    {"w poblizu", 1, {DICTIONARY_NEAR}, 4085},
     {"święty", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"wschod", 1, {DICTIONARY_DIRECTIONAL}, 4075},
     {"młodszy", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},
     {"kwartał", 1, {DICTIONARY_QUALIFIER}, -1},
     {"parter", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"un", 1, {DICTIONARY_PLACE_NAME}, 4165},
     {"obok", 1, {DICTIONARY_NEAR}, -1},
-    {"w poblizu", 1, {DICTIONARY_NEAR}, 4083},
     {"w pobliżu mnie", 1, {DICTIONARY_NEAR}, -1},
+    {"kpt mar", 1, {DICTIONARY_PERSONAL_TITLE}, 4114},
+    {"st sierz sztab", 1, {DICTIONARY_PERSONAL_TITLE}, 4140},
+    {"kosciol", 1, {DICTIONARY_PLACE_NAME}, 4157},
+    {"min", 1, {DICTIONARY_PERSONAL_TITLE}, 4128},
     {"republika", 1, {DICTIONARY_SYNONYM}, -1},
     {"północ", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"polnoc", 1, {DICTIONARY_DIRECTIONAL}, 4070},
-    {"gm", 1, {DICTIONARY_QUALIFIER}, 4170},
-    {"gen broni", 1, {DICTIONARY_PERSONAL_TITLE}, 4104},
-    {"lek", 1, {DICTIONARY_PERSONAL_TITLE}, 4121},
-    {"zakł", 1, {DICTIONARY_PLACE_NAME}, 4166},
+    {"lic", 1, {DICTIONARY_PLACE_NAME}, 4158},
+    {"mjr", 1, {DICTIONARY_PERSONAL_TITLE}, 4125},
+    {"marszalka", 1, {DICTIONARY_PERSONAL_TITLE}, 4127},
     {"starszy", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},
-    {"wieś", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"generala", 1, {DICTIONARY_PERSONAL_TITLE}, 4105},
     {"brygada", 1, {DICTIONARY_SYNONYM}, -1},
     {"ulica", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pln", 1, {DICTIONARY_DIRECTIONAL}, 4070},
-    {"kol", 1, {DICTIONARY_PLACE_NAME}, 4154},
     {"technikum", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"cieśn", 1, {DICTIONARY_SYNONYM}, 4185},
-    {"dyr", 1, {DICTIONARY_PERSONAL_TITLE}, 4101},
+    {"hr", 1, {DICTIONARY_PERSONAL_TITLE}, 4110},
     {"administracja", 1, {DICTIONARY_SYNONYM}, -1},
     {"minister", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"bl", 1, {DICTIONARY_QUALIFIER}, 4168},
+    {"abp", 1, {DICTIONARY_PERSONAL_TITLE}, 4096},
     {"skrytka pocztowa", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"centr", 1, {DICTIONARY_SYNONYM}, 4184},
-    {"bosm", 1, {DICTIONARY_PERSONAL_TITLE}, 4096},
+    {"s-ka", 1, {DICTIONARY_COMPANY_TYPE}, 4067},
     {"w", 4, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_CROSS_STREET, DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
-    {"bczka", 1, {DICTIONARY_PLACE_NAME}, 4147},
-    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4103},
-    {"o", 1, {DICTIONARY_PERSONAL_TITLE}, 4127},
+    {"p", 1, {DICTIONARY_LEVEL_NUMBERED}, 4083},
+    {"płd-zach", 1, {DICTIONARY_DIRECTIONAL}, 4078},
     {"biblioteczka", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"w pobliżu tutaj", 1, {DICTIONARY_NEAR}, -1},
-    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4077},
+    {"sekt", 1, {DICTIONARY_PERSONAL_TITLE}, 4134},
     {"obwodnica", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"wsch", 1, {DICTIONARY_DIRECTIONAL}, 4073},
-    {"spnia", 1, {DICTIONARY_COMPANY_TYPE}, 4067},
-    {"gen bryg", 1, {DICTIONARY_PERSONAL_TITLE}, 4105},
+    {"bot", 1, {DICTIONARY_SYNONYM}, 4183},
+    {"batalion", 1, {DICTIONARY_SYNONYM}, -1},
     {"narodowy", 1, {DICTIONARY_SYNONYM}, -1},
     {"pomiędzy", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"kontradmiral", 1, {DICTIONARY_PERSONAL_TITLE}, 4115},
-    {"pl", 1, {DICTIONARY_STREET_TYPE}, 4176},
-    {"okręg", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"no", 1, {DICTIONARY_NUMBER}, 4087},
-    {"państw", 1, {DICTIONARY_SYNONYM}, 4191},
-    {"mł", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4088},
-    {"oddz", 1, {DICTIONARY_PLACE_NAME}, 4158},
-    {"podsekr", 1, {DICTIONARY_PERSONAL_TITLE}, 4130},
-    {"mar", 1, {DICTIONARY_PERSONAL_TITLE}, 4124},
-    {"os", 1, {DICTIONARY_QUALIFIER}, 4173},
-    {"pok", 1, {DICTIONARY_UNIT_NUMBERED}, 4199},
-    {"wokol tutaj", 1, {DICTIONARY_NEAR}, 4086},
-    {"strz", 1, {DICTIONARY_PERSONAL_TITLE}, 4136},
+    {"na", 1, {DICTIONARY_STOPWORD}, -1},
+    {"płd wsch", 1, {DICTIONARY_DIRECTIONAL}, 4077},
+    {"pd zach", 1, {DICTIONARY_DIRECTIONAL}, 4078},
+    {"pn.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4074},
+    {"ośr", 1, {DICTIONARY_PLACE_NAME}, 4163},
+    {"st", 1, {DICTIONARY_PLACE_NAME}, 4164},
+    {"mgr", 1, {DICTIONARY_PERSONAL_TITLE}, 4124},
+    {"mn", 1, {DICTIONARY_PLACE_NAME}, 4159},
     {"biblioteka", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"cieśnina", 1, {DICTIONARY_SYNONYM}, -1},
-    {"pd", 1, {DICTIONARY_DIRECTIONAL}, 4074},
-    {"kmdr ppor", 1, {DICTIONARY_PERSONAL_TITLE}, 4118},
+    {"spółdz", 1, {DICTIONARY_COMPANY_TYPE}, 4069},
     {"federacja", 1, {DICTIONARY_SYNONYM}, -1},
-    {"płd zach", 1, {DICTIONARY_DIRECTIONAL}, 4076},
-    {"pln-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4071},
-    {"poludniowy wschod", 1, {DICTIONARY_DIRECTIONAL}, 4075},
-    {"gen dyw", 1, {DICTIONARY_PERSONAL_TITLE}, 4106},
+    {"d", 1, {DICTIONARY_HOUSE_NUMBER}, 4081},
+    {"bpa", 1, {DICTIONARY_PERSONAL_TITLE}, 4100},
+    {"inst", 1, {DICTIONARY_PLACE_NAME}, 4155},
     {"blok", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"pd wsch", 1, {DICTIONARY_DIRECTIONAL}, 4075},
+    {"ptr", 1, {DICTIONARY_LEVEL_NUMBERED}, 4083},
+    {"płd.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4078},
     {"siostry", 1, {DICTIONARY_SYNONYM}, -1},
+    {"skr poczt", 1, {DICTIONARY_POST_OFFICE}, 4169},
+    {"un", 1, {DICTIONARY_PLACE_NAME}, 4167},
     {"i", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
-    {"płd-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4075},
+    {"st kol", 1, {DICTIONARY_PLACE_NAME}, 4165},
     {"niedaleko", 1, {DICTIONARY_NEAR}, -1},
     {"admirał", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"marszalka", 1, {DICTIONARY_PERSONAL_TITLE}, 4125},
+    {"pok", 1, {DICTIONARY_UNIT_NUMBERED}, 4201},
+    {"gen broni", 1, {DICTIONARY_PERSONAL_TITLE}, 4106},
+    {"lek", 1, {DICTIONARY_PERSONAL_TITLE}, 4123},
     {"autostrada", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"wokół tutaj", 1, {DICTIONARY_NEAR}, -1},
     {"bracia", 1, {DICTIONARY_SYNONYM}, -1},
-    {"st", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4089},
-    {"jez", 1, {DICTIONARY_SYNONYM}, 4189},
+    {"płd-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4077},
+    {"cieśn", 1, {DICTIONARY_SYNONYM}, 4187},
+    {"dln", 1, {DICTIONARY_SYNONYM}, 4188},
     {"parkowa", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"spółdzielnia", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"amb", 1, {DICTIONARY_PERSONAL_TITLE}, 4092},
-    {"bpa", 1, {DICTIONARY_PERSONAL_TITLE}, 4098},
+    {"starszy sierżant", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"bl", 1, {DICTIONARY_QUALIFIER}, 4170},
+    {"szeregowy", 1, {DICTIONARY_SYNONYM}, -1},
     {"spółka", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"ok", 1, {DICTIONARY_QUALIFIER}, 4172},
     {"przy", 1, {DICTIONARY_NEAR}, -1},
-    {"płn.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4071},
-    {"zakl", 1, {DICTIONARY_PLACE_NAME}, 4166},
-    {"p", 1, {DICTIONARY_LEVEL_NUMBERED}, 4081},
-    {"płd-zach", 1, {DICTIONARY_DIRECTIONAL}, 4076},
-    {"podsekretarz", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sekt", 1, {DICTIONARY_PERSONAL_TITLE}, 4132},
+    {"bczka", 1, {DICTIONARY_PLACE_NAME}, 4149},
+    {"generał dywizji", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"b-czka", 1, {DICTIONARY_PLACE_NAME}, 4149},
+    {"we", 1, {DICTIONARY_NEAR}, -1},
+    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4079},
+    {"kpt", 1, {DICTIONARY_PERSONAL_TITLE}, 4113},
     {"abc", 1, {DICTIONARY_CHAIN}, -1},
-    {"pd.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4076},
+    {"wsch", 1, {DICTIONARY_DIRECTIONAL}, 4075},
+    {"północny zachód", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"bn", 1, {DICTIONARY_PLACE_NAME}, 4148},
     {"bank", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"inst", 1, {DICTIONARY_PLACE_NAME}, 4153},
-    {"adw", 1, {DICTIONARY_ACADEMIC_DEGREE}, 4062},
     {"kapral", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"plac", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pln.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4071},
-    {"pd-zach", 1, {DICTIONARY_DIRECTIONAL}, 4076},
-    {"kolo", 1, {DICTIONARY_NEAR}, 4082},
+    {"fed", 1, {DICTIONARY_SYNONYM}, 4189},
+    {"kmdr", 1, {DICTIONARY_PERSONAL_TITLE}, 4118},
+    {"kontradmiral", 1, {DICTIONARY_PERSONAL_TITLE}, 4117},
+    {"s-ka akc", 1, {DICTIONARY_COMPANY_TYPE}, 4068},
     {"&", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"płd wsch", 1, {DICTIONARY_DIRECTIONAL}, 4075},
     {"wiceminister", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pd zach", 1, {DICTIONARY_DIRECTIONAL}, 4076},
-    {"st sierz", 1, {DICTIONARY_PERSONAL_TITLE}, 4137},
-    {"pn.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4072},
+    {"adj", 1, {DICTIONARY_PERSONAL_TITLE}, 4092},
     {"inżynier", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"kw", 1, {DICTIONARY_QUALIFIER}, 4171},
-    {"szer", 1, {DICTIONARY_SYNONYM}, 4196},
-    {"w", 1, {DICTIONARY_DIRECTIONAL}, 4073},
-    {"b-ka", 1, {DICTIONARY_PLACE_NAME}, 4145},
-    {"płn-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4071},
-    {"dep", 1, {DICTIONARY_PLACE_NAME}, 4148},
-    {"adr", 1, {DICTIONARY_SYNONYM}, 4179},
-    {"lekarz", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"baon", 1, {DICTIONARY_SYNONYM}, 4180},
+    {"f-ka", 1, {DICTIONARY_PLACE_NAME}, 4152},
+    {"marsz", 1, {DICTIONARY_PERSONAL_TITLE}, 4127},
+    {"mar", 1, {DICTIONARY_PERSONAL_TITLE}, 4126},
+    {"os", 1, {DICTIONARY_QUALIFIER}, 4175},
+    {"zachod", 1, {DICTIONARY_DIRECTIONAL}, 4079},
+    {"st bosm", 1, {DICTIONARY_PERSONAL_TITLE}, 4137},
+    {"g", 1, {DICTIONARY_SYNONYM}, 4190},
+    {"fabryka", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"stary", 1, {DICTIONARY_SYNONYM}, -1},
+    {"płn-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4073},
     {"schody", 1, {DICTIONARY_STAIRCASE}, -1},
-    {"w poblizu mnie", 1, {DICTIONARY_NEAR}, 4084},
     {"dom", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
-    {"spółdz", 1, {DICTIONARY_COMPANY_TYPE}, 4067},
+    {"s", 1, {DICTIONARY_LEVEL_BASEMENT}, 4082},
+    {"kmdt", 1, {DICTIONARY_PERSONAL_TITLE}, 4121},
     {"muzeum narodowe", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"zaulek", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"płd zach", 1, {DICTIONARY_DIRECTIONAL}, 4078},
+    {"asystent", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"dziek", 1, {DICTIONARY_PERSONAL_TITLE}, 4104},
+    {"pln-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4073},
+    {"zakl", 1, {DICTIONARY_PLACE_NAME}, 4168},
     {"generał broni", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"w poblizu tutaj", 1, {DICTIONARY_NEAR}, 4085},
-    {"adj", 1, {DICTIONARY_PERSONAL_TITLE}, 4090},
-    {"bryg", 1, {DICTIONARY_SYNONYM}, 4183},
-    {"ptr", 1, {DICTIONARY_LEVEL_NUMBERED}, 4081},
-    {"płd.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4076},
-    {"stow", 1, {DICTIONARY_COMPANY_TYPE}, 4068},
-    {"adm", 1, {DICTIONARY_PERSONAL_TITLE}, 4091},
+    {"poludniowy wschod", 1, {DICTIONARY_DIRECTIONAL}, 4077},
+    {"b-cia", 1, {DICTIONARY_SYNONYM}, 4184},
+    {"swiety", 1, {DICTIONARY_PERSONAL_TITLE}, 4142},
+    {"pd wsch", 1, {DICTIONARY_DIRECTIONAL}, 4077},
+    {"admiral", 1, {DICTIONARY_PERSONAL_TITLE}, 4093},
     {"akademia", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"rogu", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"op", 1, {DICTIONARY_PLACE_NAME}, 4159},
+    {"k", 1, {DICTIONARY_NEAR}, 4084},
     {"lewo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"wielebny", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"st kol", 1, {DICTIONARY_PLACE_NAME}, 4163},
     {"dziekan", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"ambasador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"prof", 1, {DICTIONARY_PERSONAL_TITLE}, 4131},
+    {"polnocny wschod", 1, {DICTIONARY_DIRECTIONAL}, 4073},
     {"arcybiskup", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"kpr", 1, {DICTIONARY_PERSONAL_TITLE}, 4112},
     {"wyspa", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"pln zach", 1, {DICTIONARY_DIRECTIONAL}, 4072},
     {"p", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"płn.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4074},
+    {"szer", 1, {DICTIONARY_SYNONYM}, 4198},
     {"bazylika", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"bcia", 1, {DICTIONARY_SYNONYM}, 4182},
-    {"swiety", 1, {DICTIONARY_PERSONAL_TITLE}, 4140},
-    {"kmdt", 1, {DICTIONARY_PERSONAL_TITLE}, 4119},
+    {"państw", 1, {DICTIONARY_SYNONYM}, 4193},
+    {"st", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4091},
+    {"pld zach", 1, {DICTIONARY_DIRECTIONAL}, 4078},
+    {"kontradm", 1, {DICTIONARY_PERSONAL_TITLE}, 4117},
+    {"jez", 1, {DICTIONARY_SYNONYM}, 4191},
     {"starszy bosman", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pld-zach", 1, {DICTIONARY_DIRECTIONAL}, 4076},
+    {"podofic", 1, {DICTIONARY_PERSONAL_TITLE}, 4131},
+    {"ojciec", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"katedra", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"opat", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"akad", 1, {DICTIONARY_PLACE_NAME}, 4144},
+    {"poludniowy zachod", 1, {DICTIONARY_DIRECTIONAL}, 4078},
     {"gospodarka", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"uniwersytet", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"arch", 1, {DICTIONARY_PERSONAL_TITLE}, 4093},
-    {"hon", 1, {DICTIONARY_PERSONAL_TITLE}, 4107},
+    {"amb", 1, {DICTIONARY_PERSONAL_TITLE}, 4094},
+    {"ok", 1, {DICTIONARY_QUALIFIER}, 4174},
     {"piętro", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"marynarz", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"komendant", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"b-czka", 1, {DICTIONARY_PLACE_NAME}, 4147},
     {"dzielnica", 1, {DICTIONARY_QUALIFIER}, -1},
     {"rynek", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"polnocny zachod", 1, {DICTIONARY_DIRECTIONAL}, 4072},
+    {"adm", 1, {DICTIONARY_SYNONYM}, 4180},
+    {"d-ca", 1, {DICTIONARY_PERSONAL_TITLE}, 4102},
     {"kolejowy", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"bn", 1, {DICTIONARY_PLACE_NAME}, 4146},
+    {"pd.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4078},
+    {"wejscie", 1, {DICTIONARY_ENTRANCE}, 4080},
     {"kierownik", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"szereg", 1, {DICTIONARY_SYNONYM}, 4196},
-    {"fed", 1, {DICTIONARY_SYNONYM}, 4187},
-    {"kmdr", 1, {DICTIONARY_PERSONAL_TITLE}, 4116},
+    {"zakł", 1, {DICTIONARY_PLACE_NAME}, 4168},
+    {"pn wsch", 1, {DICTIONARY_DIRECTIONAL}, 4073},
+    {"wiceadm", 1, {DICTIONARY_PERSONAL_TITLE}, 4144},
+    {"as", 1, {DICTIONARY_PERSONAL_TITLE}, 4097},
+    {"pd-zach", 1, {DICTIONARY_DIRECTIONAL}, 4078},
     {"strzelec", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"dowódca", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"nar", 1, {DICTIONARY_SYNONYM}, 4190},
     {"wielmozny", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},
-    {"pn wsch", 1, {DICTIONARY_DIRECTIONAL}, 4071},
-    {"płd.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4075},
+    {"bibl", 1, {DICTIONARY_PLACE_NAME}, 4147},
+    {"pd.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4077},
     {"stacja", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"uniw", 1, {DICTIONARY_PLACE_NAME}, 4165},
-    {"pn-zach", 1, {DICTIONARY_DIRECTIONAL}, 4072},
-    {"marsz", 1, {DICTIONARY_PERSONAL_TITLE}, 4125},
-    {"bosm sztab", 1, {DICTIONARY_PERSONAL_TITLE}, 4097},
-    {"zachod", 1, {DICTIONARY_DIRECTIONAL}, 4077},
+    {"st sierz", 1, {DICTIONARY_PERSONAL_TITLE}, 4139},
+    {"dowodca", 1, {DICTIONARY_PERSONAL_TITLE}, 4102},
+    {"b-ka", 1, {DICTIONARY_PLACE_NAME}, 4147},
     {"marszałka", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"st bosm", 1, {DICTIONARY_PERSONAL_TITLE}, 4135},
+    {"płd", 1, {DICTIONARY_DIRECTIONAL}, 4076},
     {"politechnika", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"górny", 1, {DICTIONARY_SYNONYM}, -1},
-    {"pn zach", 1, {DICTIONARY_DIRECTIONAL}, 4072},
-    {"s", 1, {DICTIONARY_LEVEL_BASEMENT}, 4080},
-    {"św", 1, {DICTIONARY_PERSONAL_TITLE}, 4140},
-    {"dca", 1, {DICTIONARY_PERSONAL_TITLE}, 4100},
-    {"ojciec", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"dziek", 1, {DICTIONARY_PERSONAL_TITLE}, 4102},
-    {"st", 1, {DICTIONARY_SYNONYM}, 4195},
+    {"pln.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4074},
+    {"w poblizu mnie", 1, {DICTIONARY_NEAR}, 4086},
+    {"kom", 1, {DICTIONARY_PERSONAL_TITLE}, 4121},
+    {"w poblizu tutaj", 1, {DICTIONARY_NEAR}, 4087},
+    {"pld-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4077},
     {"sierżant", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"kier", 1, {DICTIONARY_PERSONAL_TITLE}, 4114},
+    {"gimnazjum", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"adjunkt", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"kościół", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"adwokat", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},
-    {"admiral", 1, {DICTIONARY_PERSONAL_TITLE}, 4091},
+    {"stow", 1, {DICTIONARY_COMPANY_TYPE}, 4070},
+    {"adm", 1, {DICTIONARY_PERSONAL_TITLE}, 4093},
     {"centralny", 1, {DICTIONARY_SYNONYM}, -1},
+    {"zabka", 1, {DICTIONARY_CHAIN}, 4066},
+    {"profesor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"płn wsch", 1, {DICTIONARY_DIRECTIONAL}, 4073},
     {"u", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"gmina", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"k", 1, {DICTIONARY_NEAR}, 4082},
-    {"wschod", 1, {DICTIONARY_DIRECTIONAL}, 4073},
-    {"techn", 1, {DICTIONARY_PLACE_NAME}, 4164},
+    {"okręg", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"pomiedzy", 1, {DICTIONARY_CROSS_STREET}, 4071},
     {"jezioro", 1, {DICTIONARY_SYNONYM}, -1},
     {"wejście", 1, {DICTIONARY_ENTRANCE}, -1},
+    {"pln.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4073},
     {"o", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"sw", 1, {DICTIONARY_PERSONAL_TITLE}, 4140},
-    {"kosciol", 1, {DICTIONARY_PLACE_NAME}, 4155},
-    {"polnocny wschod", 1, {DICTIONARY_DIRECTIONAL}, 4071},
-    {"pld", 1, {DICTIONARY_DIRECTIONAL}, 4074},
+    {"baon", 1, {DICTIONARY_SYNONYM}, 4182},
     {"bosman sztabowy", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"kpr", 1, {DICTIONARY_PERSONAL_TITLE}, 4110},
+    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4101},
     {"senator", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"zaklad", 1, {DICTIONARY_PLACE_NAME}, 4166},
+    {"pln zach", 1, {DICTIONARY_DIRECTIONAL}, 4074},
     {"kontradmirał", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"stowarzyszenie", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"spółka akcyjna", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"asystent", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"#", 1, {DICTIONARY_NUMBER}, 4089},
+    {"rz", 1, {DICTIONARY_SYNONYM}, 4195},
+    {"pln", 1, {DICTIONARY_DIRECTIONAL}, 4072},
     {"blisko", 1, {DICTIONARY_NEAR}, -1},
-    {"pld zach", 1, {DICTIONARY_DIRECTIONAL}, 4076},
+    {"pd-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4077},
+    {"generała", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"rondo", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"d", 1, {DICTIONARY_HOUSE_NUMBER}, 4079},
+    {"św", 1, {DICTIONARY_PERSONAL_TITLE}, 4142},
+    {"pld-zach", 1, {DICTIONARY_DIRECTIONAL}, 4078},
+    {"kard", 1, {DICTIONARY_PERSONAL_TITLE}, 4115},
+    {"st strz", 1, {DICTIONARY_PERSONAL_TITLE}, 4141},
+    {"akad", 1, {DICTIONARY_PLACE_NAME}, 4146},
     {"aleja", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"poludniowy zachod", 1, {DICTIONARY_DIRECTIONAL}, 4076},
+    {"№", 1, {DICTIONARY_NUMBER}, 4089},
+    {"płn.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4073},
+    {"arch", 1, {DICTIONARY_PERSONAL_TITLE}, 4095},
+    {"hon", 1, {DICTIONARY_PERSONAL_TITLE}, 4109},
     {"komandor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pld.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4075},
+    {"o", 1, {DICTIONARY_PERSONAL_TITLE}, 4129},
     {"południowy zachód", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"wwa", 1, {DICTIONARY_TOPONYM}, 4197},
-    {"płn wsch", 1, {DICTIONARY_DIRECTIONAL}, 4071},
-    {"d-ca", 1, {DICTIONARY_PERSONAL_TITLE}, 4100},
-    {"wejscie", 1, {DICTIONARY_ENTRANCE}, 4078},
-    {"pokój", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"bibl", 1, {DICTIONARY_PLACE_NAME}, 4145},
-    {"boczna", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"st sierz sztab", 1, {DICTIONARY_PERSONAL_TITLE}, 4138},
-    {"koło", 1, {DICTIONARY_NEAR}, -1},
-    {"st", 1, {DICTIONARY_PLACE_NAME}, 4162},
-    {"mjr", 1, {DICTIONARY_PERSONAL_TITLE}, 4123},
-    {"min", 1, {DICTIONARY_PERSONAL_TITLE}, 4126},
     {"dolny", 1, {DICTIONARY_SYNONYM}, -1},
-    {"pln.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4072},
+    {"bn", 1, {DICTIONARY_SYNONYM}, 4182},
+    {"polnocny zachod", 1, {DICTIONARY_DIRECTIONAL}, 4074},
+    {"dziel", 1, {DICTIONARY_QUALIFIER}, 4171},
+    {"szereg", 1, {DICTIONARY_SYNONYM}, 4198},
+    {"bcia", 1, {DICTIONARY_SYNONYM}, 4184},
+    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4179},
+    {"boczna", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"poludnie", 1, {DICTIONARY_DIRECTIONAL}, 4076},
+    {"podsekr", 1, {DICTIONARY_PERSONAL_TITLE}, 4132},
+    {"na rogu", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"bosm sztab", 1, {DICTIONARY_PERSONAL_TITLE}, 4099},
+    {"w", 1, {DICTIONARY_PERSONAL_TITLE}, 4143},
+    {"adr", 1, {DICTIONARY_SYNONYM}, 4181},
+    {"wokol tutaj", 1, {DICTIONARY_NEAR}, 4088},
+    {"zach", 1, {DICTIONARY_DIRECTIONAL}, 4079},
+    {"pd", 1, {DICTIONARY_DIRECTIONAL}, 4076},
+    {"dca", 1, {DICTIONARY_PERSONAL_TITLE}, 4102},
     {"starszy strzelec", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"pln wsch", 1, {DICTIONARY_DIRECTIONAL}, 4073},
     {"liceum", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"wschód", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"botanika", 1, {DICTIONARY_SYNONYM}, -1},
-    {"wicemin", 1, {DICTIONARY_PERSONAL_TITLE}, 4143},
     {"biskupa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"zabka", 1, {DICTIONARY_CHAIN}, 4064},
-    {"kwartal", 1, {DICTIONARY_QUALIFIER}, 4171},
-    {"inż", 1, {DICTIONARY_PERSONAL_TITLE}, 4109},
-    {"pomiedzy", 1, {DICTIONARY_CROSS_STREET}, 4069},
+    {"wiceadmiral", 1, {DICTIONARY_PERSONAL_TITLE}, 4144},
+    {"techn", 1, {DICTIONARY_PLACE_NAME}, 4166},
     {"oddział", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"generał dywizji", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"wiceadm", 1, {DICTIONARY_PERSONAL_TITLE}, 4142},
-    {"ks", 1, {DICTIONARY_PERSONAL_TITLE}, 4120},
-    {"gosp", 1, {DICTIONARY_PLACE_NAME}, 4152},
-    {"płn-zach", 1, {DICTIONARY_DIRECTIONAL}, 4072},
+    {"kadm", 1, {DICTIONARY_PERSONAL_TITLE}, 4117},
+    {"kmdr por", 1, {DICTIONARY_PERSONAL_TITLE}, 4119},
+    {"sw", 1, {DICTIONARY_PERSONAL_TITLE}, 4142},
     {"zakład", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"no", 1, {DICTIONARY_NUMBER}, 4089},
+    {"podsekretarz", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"pld", 1, {DICTIONARY_DIRECTIONAL}, 4076},
     {"północny wschód", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"w-wa", 1, {DICTIONARY_TOPONYM}, 4197},
+    {"nr", 1, {DICTIONARY_NUMBER}, 4089},
+    {"zaklad", 1, {DICTIONARY_PLACE_NAME}, 4168},
     {"kapitan marynarki", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"g", 1, {DICTIONARY_SYNONYM}, 4188},
-    {"#", 1, {DICTIONARY_NUMBER}, 4087},
-    {"rz", 1, {DICTIONARY_SYNONYM}, 4193},
-    {"pd-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4075},
-    {"mgr", 1, {DICTIONARY_PERSONAL_TITLE}, 4122},
+    {"dep", 1, {DICTIONARY_PLACE_NAME}, 4150},
+    {"ss", 1, {DICTIONARY_SYNONYM}, 4196},
     {"bulwar", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"adm", 1, {DICTIONARY_SYNONYM}, 4178},
+    {"rep", 1, {DICTIONARY_SYNONYM}, 4194},
     {"państwowy", 1, {DICTIONARY_SYNONYM}, -1},
-    {"gimnazjum", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"kard", 1, {DICTIONARY_PERSONAL_TITLE}, 4113},
-    {"wojewodztwo", 1, {DICTIONARY_QUALIFIER}, 4174},
-    {"st strz", 1, {DICTIONARY_PERSONAL_TITLE}, 4139},
-    {"kom", 1, {DICTIONARY_PERSONAL_TITLE}, 4119},
+    {"kmdr ppor", 1, {DICTIONARY_PERSONAL_TITLE}, 4120},
+    {"al", 1, {DICTIONARY_STREET_TYPE}, 4177},
     {"generał brygady", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"prawo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"pld.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4078},
+    {"płn", 1, {DICTIONARY_DIRECTIONAL}, 4072},
     {"warszawa", 1, {DICTIONARY_TOPONYM}, -1},
     {"osiedle", 1, {DICTIONARY_QUALIFIER}, -1},
     {"ksiądz", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"organizacja", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"kwartal", 1, {DICTIONARY_QUALIFIER}, 4173},
+    {"pld.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4077},
     {"numer", 1, {DICTIONARY_NUMBER}, -1},
-    {"północny zachód", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"bn", 1, {DICTIONARY_SYNONYM}, 4180},
+    {"wwa", 1, {DICTIONARY_TOPONYM}, 4199},
+    {"nar", 1, {DICTIONARY_SYNONYM}, 4192},
+    {"koło", 1, {DICTIONARY_NEAR}, -1},
     {"hrabia", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"u", 1, {DICTIONARY_PLACE_NAME}, 4165},
     {"komandor podporucznik", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"dziel", 1, {DICTIONARY_QUALIFIER}, 4169},
+    {"pn-wsch", 1, {DICTIONARY_DIRECTIONAL}, 4073},
     {"kapitan", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"m", 1, {DICTIONARY_UNIT_NUMBERED}, 4198},
+    {"wojewodztwo", 1, {DICTIONARY_QUALIFIER}, 4176},
     {"szosa", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"generała", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4177},
-    {"s-ka akc", 1, {DICTIONARY_COMPANY_TYPE}, 4066},
-    {"na rogu", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"nr", 1, {DICTIONARY_NUMBER}, 4087},
-    {"w", 1, {DICTIONARY_PERSONAL_TITLE}, 4141},
-    {"pn.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4071},
-    {"gim", 1, {DICTIONARY_PLACE_NAME}, 4151},
+    {"kolo", 1, {DICTIONARY_NEAR}, 4084},
+    {"pokój", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"oddz", 1, {DICTIONARY_PLACE_NAME}, 4160},
+    {"op", 1, {DICTIONARY_PLACE_NAME}, 4161},
     {"wiceadmirał", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"płn zach", 1, {DICTIONARY_DIRECTIONAL}, 4074},
     {"szkoła", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"zach", 1, {DICTIONARY_DIRECTIONAL}, 4077},
-    {"as", 1, {DICTIONARY_PERSONAL_TITLE}, 4095},
     {"południe", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"suterena", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
-    {"płn", 1, {DICTIONARY_DIRECTIONAL}, 4070},
-    {"pln wsch", 1, {DICTIONARY_DIRECTIONAL}, 4071},
-    {"poludnie", 1, {DICTIONARY_DIRECTIONAL}, 4074},
-    {"sierz", 1, {DICTIONARY_PERSONAL_TITLE}, 4134},
     {"stacja kolejowa", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"kardynala", 1, {DICTIONARY_PERSONAL_TITLE}, 4113},
+    {"wicemin", 1, {DICTIONARY_PERSONAL_TITLE}, 4145},
+    {"sierz", 1, {DICTIONARY_PERSONAL_TITLE}, 4136},
+    {"pn zach", 1, {DICTIONARY_DIRECTIONAL}, 4074},
     {"k", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"farm", 1, {DICTIONARY_PLACE_NAME}, 4149},
-    {"kadm", 1, {DICTIONARY_PERSONAL_TITLE}, 4115},
-    {"kmdr por", 1, {DICTIONARY_PERSONAL_TITLE}, 4117},
-    {"f-ka", 1, {DICTIONARY_PLACE_NAME}, 4150},
+    {"inż", 1, {DICTIONARY_PERSONAL_TITLE}, 4111},
+    {"bka", 1, {DICTIONARY_PLACE_NAME}, 4147},
+    {"ks", 1, {DICTIONARY_PERSONAL_TITLE}, 4122},
+    {"gosp", 1, {DICTIONARY_PLACE_NAME}, 4154},
+    {"płn-zach", 1, {DICTIONARY_DIRECTIONAL}, 4074},
     {"w pobliżu", 1, {DICTIONARY_NEAR}, -1},
-    {"płn.-zach.", 1, {DICTIONARY_DIRECTIONAL}, 4072},
-    {"batalion", 1, {DICTIONARY_SYNONYM}, -1},
+    {"mł", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4090},
+    {"prof", 1, {DICTIONARY_PERSONAL_TITLE}, 4133},
     {"budowa", 1, {DICTIONARY_BUILDING_TYPE}, -1},
-    {"generala", 1, {DICTIONARY_PERSONAL_TITLE}, 4103},
+    {"w-wa", 1, {DICTIONARY_TOPONYM}, 4199},
+    {"admin", 1, {DICTIONARY_SYNONYM}, 4180},
+    {"gim", 1, {DICTIONARY_PLACE_NAME}, 4153},
+    {"kw", 1, {DICTIONARY_QUALIFIER}, 4173},
     {"żabka", 1, {DICTIONARY_CHAIN}, -1},
     {"adres", 1, {DICTIONARY_SYNONYM}, -1},
     {"starszy sierżant sztabowy", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"rep", 1, {DICTIONARY_SYNONYM}, 4192},
-    {"pld wsch", 1, {DICTIONARY_DIRECTIONAL}, 4075},
     {"poczta polska", 1, {DICTIONARY_CHAIN}, -1},
-    {"starszy sierżant", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"we", 1, {DICTIONARY_NEAR}, -1},
-    {"szeregowy", 1, {DICTIONARY_SYNONYM}, -1},
+    {"spółdzielnia", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"płk", 1, {DICTIONARY_PERSONAL_TITLE}, 4130},
     {"mieszkanie", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"podofic", 1, {DICTIONARY_PERSONAL_TITLE}, 4129},
+    {"uniw", 1, {DICTIONARY_PLACE_NAME}, 4167},
     {"sekretarz", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"b-cia", 1, {DICTIONARY_SYNONYM}, 4182},
-    {"pln-zach", 1, {DICTIONARY_DIRECTIONAL}, 4072},
-    {"profesor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"pn-zach", 1, {DICTIONARY_DIRECTIONAL}, 4074},
+    {"bryg", 1, {DICTIONARY_SYNONYM}, 4185},
+    {"sen", 1, {DICTIONARY_PERSONAL_TITLE}, 4135},
+    {"u", 1, {DICTIONARY_PLACE_NAME}, 4167},
+    {"organ", 1, {DICTIONARY_PLACE_NAME}, 4162},
     {"doktora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"na", 1, {DICTIONARY_STOPWORD}, -1},
     {"zachód", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"ośrodek", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"podoficer", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"płd.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4077},
     {"d", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"pd.-wsch.", 1, {DICTIONARY_DIRECTIONAL}, 4075},
-    {"kpt mar", 1, {DICTIONARY_PERSONAL_TITLE}, 4112},
     {"rzeka", 1, {DICTIONARY_SYNONYM}, -1},
-    {"dowodca", 1, {DICTIONARY_PERSONAL_TITLE}, 4100},
     {"m", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"lic", 1, {DICTIONARY_PLACE_NAME}, 4156},
-    {"admin", 1, {DICTIONARY_SYNONYM}, 4178},
+    {"polnoc", 1, {DICTIONARY_DIRECTIONAL}, 4072},
+    {"gm", 1, {DICTIONARY_QUALIFIER}, 4172},
     {"honorowy", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"architekt", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"płn zach", 1, {DICTIONARY_DIRECTIONAL}, 4072},
     {"g", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"bud", 1, {DICTIONARY_BUILDING_TYPE}, 4063},
-    {"kontradm", 1, {DICTIONARY_PERSONAL_TITLE}, 4115},
-    {"hr", 1, {DICTIONARY_PERSONAL_TITLE}, 4108},
+    {"kol", 1, {DICTIONARY_PLACE_NAME}, 4156},
+    {"bosm", 1, {DICTIONARY_PERSONAL_TITLE}, 4098},
+    {"bud", 1, {DICTIONARY_BUILDING_TYPE}, 4065},
+    {"woj", 1, {DICTIONARY_QUALIFIER}, 4176},
     {"biblioteka narodowa", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"woj", 1, {DICTIONARY_QUALIFIER}, 4174},
-    {"s-ka", 1, {DICTIONARY_COMPANY_TYPE}, 4065},
+    {"dyr", 1, {DICTIONARY_PERSONAL_TITLE}, 4103},
+    {"kier", 1, {DICTIONARY_PERSONAL_TITLE}, 4116},
+    {"centr", 1, {DICTIONARY_SYNONYM}, 4186},
     {"województwo", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"ss", 1, {DICTIONARY_SYNONYM}, 4194},
-    {"abp", 1, {DICTIONARY_PERSONAL_TITLE}, 4094},
-    {"kpt", 1, {DICTIONARY_PERSONAL_TITLE}, 4111},
+    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4105},
     {"major", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"fabryka", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"lekarz", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"farmacja", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"instytut", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"skr poczt", 1, {DICTIONARY_POST_OFFICE}, 4167},
+    {"kardynala", 1, {DICTIONARY_PERSONAL_TITLE}, 4115},
+    {"adw", 1, {DICTIONARY_ACADEMIC_DEGREE}, 4064},
     {"bosman", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"bot", 1, {DICTIONARY_SYNONYM}, 4181},
-    {"bka", 1, {DICTIONARY_PLACE_NAME}, 4145},
-    {"wiceadmiral", 1, {DICTIONARY_PERSONAL_TITLE}, 4142},
+    {"spnia", 1, {DICTIONARY_COMPANY_TYPE}, 4069},
+    {"wieś", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"farm", 1, {DICTIONARY_PLACE_NAME}, 4151},
     {"kardynała", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"engo", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
-    {"pi", 1, {DICTIONARY_LEVEL_NUMBERED}, 4251},
-    {"sarg", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
-    {"estr marg", 1, {DICTIONARY_STREET_TYPE}, 4440},
+    {"gen bryg", 1, {DICTIONARY_PERSONAL_TITLE}, 4107},
+    {"pln-zach", 1, {DICTIONARY_DIRECTIONAL}, 4074},
+    {"pl", 1, {DICTIONARY_STREET_TYPE}, 4178},
+    {"m", 1, {DICTIONARY_UNIT_NUMBERED}, 4200},
+    {"snº", 1, {DICTIONARY_NO_NUMBER}, 4261},
+    {"frt", 1, {DICTIONARY_UNIT_DIRECTION}, 4446},
+    {"s.n.c", 1, {DICTIONARY_COMPANY_TYPE}, 4228},
+    {"nro", 1, {DICTIONARY_NUMBER}, 4262},
+    {"janero", 1, {DICTIONARY_SYNONYM}, 4479},
     {"setembro", 1, {DICTIONARY_SYNONYM}, -1},
-    {"r-d-c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"em ft de", 1, {DICTIONARY_STOPWORD}, 4424},
-    {"pllc", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
-    {"g.n.r", 1, {DICTIONARY_PLACE_NAME}, 4391},
-    {"ceb", 1, {DICTIONARY_PLACE_NAME}, 4374},
+    {"almirante", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"br", 1, {DICTIONARY_PLACE_NAME}, 4369},
+    {"cia", 1, {DICTIONARY_COMPANY_TYPE}, 4212},
     {"medico", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"s.e", 1, {DICTIONARY_DIRECTIONAL}, 4245},
+    {"tte cel", 1, {DICTIONARY_PERSONAL_TITLE}, 4358},
     {"azinhaga", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"alf", 1, {DICTIONARY_PERSONAL_TITLE}, 4264},
-    {"a d", 1, {DICTIONARY_COMPANY_TYPE}, 4207},
-    {"edificio", 1, {DICTIONARY_BUILDING_TYPE}, 4201},
-    {"estação", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"s e", 1, {DICTIONARY_DIRECTIONAL}, 4245},
-    {"r / c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
+    {"r", 1, {DICTIONARY_STREET_TYPE}, 4462},
+    {"distrito federal", 1, {DICTIONARY_TOPONYM}, -1},
+    {"e b", 1, {DICTIONARY_PLACE_NAME}, 4381},
+    {"centro comercial", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"super quadra", 1, {DICTIONARY_QUALIFIER}, 4418},
+    {"jr", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4264},
+    {"s a", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
+    {"fren", 1, {DICTIONARY_UNIT_DIRECTION}, 4446},
     {"excelentissima", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pr", 1, {DICTIONARY_TOPONYM}, 4507},
-    {"dist", 1, {DICTIONARY_QUALIFIER}, 4412},
+    {"s / n", 1, {DICTIONARY_NO_NUMBER}, 4261},
     {"futebol clube", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"adv.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4263},
-    {"enf", 1, {DICTIONARY_PERSONAL_TITLE}, 4299},
+    {"n sa", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
+    {"sq", 1, {DICTIONARY_QUALIFIER}, 4418},
+    {"numr", 1, {DICTIONARY_NUMBER}, 4262},
+    {"ima", 1, {DICTIONARY_PERSONAL_TITLE}, 4313},
     {"esquerdo", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT_DIRECTION}, -1},
     {"terréo", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"depto", 1, {DICTIONARY_PLACE_NAME}, 4375},
-    {"ca", 1, {DICTIONARY_COMPANY_TYPE}, 4211},
-    {"c.p", 1, {DICTIONARY_POST_OFFICE}, 4409},
-    {"viela", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"ten", 1, {DICTIONARY_PERSONAL_TITLE}, 4355},
+    {"c.c", 1, {DICTIONARY_PLACE_NAME}, 4375},
+    {"mato grosso do sul", 1, {DICTIONARY_TOPONYM}, -1},
+    {"dom", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"n.e.", 1, {DICTIONARY_DIRECTIONAL}, 4244},
+    {"enfo", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
+    {"inst", 1, {DICTIONARY_PLACE_NAME}, 4394},
+    {"ns", 1, {DICTIONARY_PERSONAL_TITLE}, 4330},
     {"unidade", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"n.ro", 1, {DICTIONARY_NUMBER}, 4260},
-    {"almirante", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"tte", 1, {DICTIONARY_PERSONAL_TITLE}, 4357},
+    {"sargento ajudante", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"lugar", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"casa", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"estr n", 1, {DICTIONARY_STREET_TYPE}, 4444},
     {"ministério", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"dtto", 1, {DICTIONARY_QUALIFIER}, 4412},
+    {"vigo", 1, {DICTIONARY_PERSONAL_TITLE}, 4362},
     {"secretario", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"na esquina da", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"s.ra", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
-    {"revma", 1, {DICTIONARY_PERSONAL_TITLE}, 4339},
-    {"ilmª", 1, {DICTIONARY_PERSONAL_TITLE}, 4308},
-    {"arqo", 1, {DICTIONARY_PLACE_NAME}, 4366},
-    {"conjunto", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"tr", 1, {DICTIONARY_BUILDING_TYPE}, 4204},
+    {"ceara", 1, {DICTIONARY_TOPONYM}, 4499},
+    {"santo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"particular", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"rio", 1, {DICTIONARY_STOPWORD}, -1},
+    {"ac", 1, {DICTIONARY_TOPONYM}, 4494},
+    {"sra", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
     {"baixos", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"s.a.r.l", 1, {DICTIONARY_COMPANY_TYPE}, 4224},
     {"por aqui", 1, {DICTIONARY_NEAR}, -1},
-    {"n sra", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
-    {"nos", 1, {DICTIONARY_STOPWORD}, -1},
-    {"ma", 1, {DICTIONARY_TOPONYM}, 4501},
-    {"e /", 1, {DICTIONARY_CROSS_STREET}, 4239},
-    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4520},
-    {"itinerario principal", 1, {DICTIONARY_STREET_TYPE}, 4446},
-    {"visc", 1, {DICTIONARY_PERSONAL_TITLE}, 4361},
-    {"b", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4367},
+    {"e.i.r.e.l.i.", 1, {DICTIONARY_COMPANY_TYPE}, 4216},
+    {"t.te", 1, {DICTIONARY_PERSONAL_TITLE}, 4357},
+    {"rio grande do norte", 1, {DICTIONARY_TOPONYM}, -1},
+    {"sr", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
+    {"janr.o", 1, {DICTIONARY_SYNONYM}, 4479},
+    {"profº", 1, {DICTIONARY_PERSONAL_TITLE}, 4335},
+    {"espírito santo", 1, {DICTIONARY_TOPONYM}, -1},
+    {"gal", 1, {DICTIONARY_PLACE_NAME}, 4392},
+    {"ribeira", 1, {DICTIONARY_SYNONYM}, -1},
+    {"s.a", 1, {DICTIONARY_COMPANY_TYPE}, 4224},
     {"eminentissimo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"rondonia", 1, {DICTIONARY_TOPONYM}, 4513},
-    {"númr", 1, {DICTIONARY_NUMBER}, 4260},
+    {"es", 1, {DICTIONARY_TOPONYM}, 4501},
+    {"praca", 1, {DICTIONARY_STREET_TYPE}, 4454},
+    {"janro", 1, {DICTIONARY_SYNONYM}, 4479},
+    {"sgps", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
+    {"organizacao da sociedade civil de interesse publico", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
+    {"cel", 1, {DICTIONARY_PERSONAL_TITLE}, 4284},
+    {"cmdr", 1, {DICTIONARY_PERSONAL_TITLE}, 4280},
+    {"st.º", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
+    {"e m", 1, {DICTIONARY_STREET_TYPE}, 4443},
     {"beco", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"irma", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
-    {"paraiba", 1, {DICTIONARY_TOPONYM}, 4506},
-    {"marq", 1, {DICTIONARY_PERSONAL_TITLE}, 4319},
+    {"9b.ro", 1, {DICTIONARY_SYNONYM}, 4487},
     {"alferes", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"dra", 1, {DICTIONARY_PERSONAL_TITLE}, 4292},
-    {"10.bro", 1, {DICTIONARY_SYNONYM}, 4473},
-    {"s c p", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
-    {"p.j.", 1, {DICTIONARY_PLACE_NAME}, 4400},
-    {"capitao", 1, {DICTIONARY_PERSONAL_TITLE}, 4271},
-    {"p.t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4255},
-    {"nªsª", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
-    {"mnt", 1, {DICTIONARY_SYNONYM}, 4483},
-    {"pres", 1, {DICTIONARY_PERSONAL_TITLE}, 4332},
-    {"a c e", 1, {DICTIONARY_COMPANY_TYPE}, 4206},
-    {"sp", 1, {DICTIONARY_TOPONYM}, 4516},
-    {"s.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
-    {"capitao de fragata", 1, {DICTIONARY_PERSONAL_TITLE}, 4273},
-    {"sr.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
+    {"p.to", 1, {DICTIONARY_PLACE_NAME}, 4404},
+    {"diaca", 1, {DICTIONARY_PERSONAL_TITLE}, 4290},
+    {"m.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4325},
+    {"résdochão", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"rua", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"ilustrissima", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"univers", 1, {DICTIONARY_PLACE_NAME}, 4409},
+    {"minas gerais", 1, {DICTIONARY_TOPONYM}, -1},
+    {"pref", 1, {DICTIONARY_PERSONAL_TITLE}, 4333},
+    {"rr", 1, {DICTIONARY_TOPONYM}, 4516},
+    {"er", 1, {DICTIONARY_STREET_TYPE}, 4445},
+    {"n.ª", 1, {DICTIONARY_STOPWORD}, 4427},
+    {"a.t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
     {"sociedade em nome coletivo", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"capitão de corveta", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"particular", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"s n", 1, {DICTIONARY_NO_NUMBER}, 4259},
+    {"g.n.r.", 1, {DICTIONARY_PLACE_NAME}, 4393},
+    {"uma", 1, {DICTIONARY_STOPWORD}, -1},
+    {"mnte", 1, {DICTIONARY_SYNONYM}, 4485},
     {"empresa pública", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"ne", 1, {DICTIONARY_DIRECTIONAL}, 4242},
-    {"n", 1, {DICTIONARY_STOPWORD}, 4426},
-    {"lxa", 1, {DICTIONARY_TOPONYM}, 4491},
-    {"núm", 1, {DICTIONARY_NUMBER}, 4260},
-    {"9b.ro", 1, {DICTIONARY_SYNONYM}, 4485},
+    {"cap corv", 1, {DICTIONARY_PERSONAL_TITLE}, 4274},
+    {"cor", 1, {DICTIONARY_PERSONAL_TITLE}, 4284},
+    {"secra", 1, {DICTIONARY_PERSONAL_TITLE}, 4348},
+    {"fundacao publica", 1, {DICTIONARY_COMPANY_TYPE}, 4219},
+    {"prolng", 1, {DICTIONARY_STREET_TYPE}, 4457},
+    {"á", 1, {DICTIONARY_STOPWORD}, -1},
+    {"n o", 1, {DICTIONARY_DIRECTIONAL}, 4245},
     {"associação desportiva", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"cp", 1, {DICTIONARY_POSTAL_CODE}, 4411},
-    {"espírito santo", 1, {DICTIONARY_TOPONYM}, -1},
-    {"sec.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4346},
-    {"c d", 1, {DICTIONARY_COMPANY_TYPE}, 4209},
-    {"so", 1, {DICTIONARY_DIRECTIONAL}, 4246},
-    {"pte", 1, {DICTIONARY_PLACE_NAME}, 4401},
-    {"bv", 1, {DICTIONARY_PLACE_NAME}, 4368},
-    {"viaduto", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"nmr.º", 1, {DICTIONARY_NUMBER}, 4260},
-    {"n srª", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
-    {"srs", 1, {DICTIONARY_PERSONAL_TITLE}, 4350},
-    {"secao", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"no", 1, {DICTIONARY_NUMBER}, 4260},
-    {"cac", 1, {DICTIONARY_PERSONAL_TITLE}, 4270},
-    {"s.e.", 1, {DICTIONARY_DIRECTIONAL}, 4245},
-    {"res", 1, {DICTIONARY_BUILDING_TYPE}, 4203},
-    {"ava marg", 1, {DICTIONARY_STREET_TYPE}, 4431},
-    {"brg", 1, {DICTIONARY_PERSONAL_TITLE}, 4269},
-    {"sociedade anonima desportiva", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
-    {"ap", 1, {DICTIONARY_TOPONYM}, 4494},
-    {"s.c.s", 1, {DICTIONARY_COMPANY_TYPE}, 4228},
-    {"ima", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
-    {"n", 1, {DICTIONARY_DIRECTIONAL}, 4241},
+    {"bo", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4369},
+    {"s n c", 1, {DICTIONARY_COMPANY_TYPE}, 4228},
+    {"sociedade fechada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"n srª", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
+    {"vigario", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"c.d.", 1, {DICTIONARY_COMPANY_TYPE}, 4211},
+    {"sarg aj.te", 1, {DICTIONARY_PERSONAL_TITLE}, 4347},
+    {"lt", 1, {DICTIONARY_UNIT_NUMBERED}, 4524},
+    {"n.o.", 1, {DICTIONARY_DIRECTIONAL}, 4245},
+    {"res-do-chao", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"das", 1, {DICTIONARY_STOPWORD}, -1},
+    {"srtas", 1, {DICTIONARY_PERSONAL_TITLE}, 4356},
+    {"ro", 1, {DICTIONARY_SYNONYM}, 4491},
+    {"nª srª", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
+    {"arc.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4268},
+    {"s.n", 1, {DICTIONARY_NO_NUMBER}, 4261},
+    {"general", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"cacique", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"acesso", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"professora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"n.a", 1, {DICTIONARY_STOPWORD}, 4425},
+    {"p s p", 1, {DICTIONARY_PLACE_NAME}, 4401},
+    {"im", 1, {DICTIONARY_PERSONAL_TITLE}, 4313},
+    {"u.l.d.a", 1, {DICTIONARY_COMPANY_TYPE}, 4237},
     {"infante", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"liberdade", 1, {DICTIONARY_SYNONYM}, -1},
-    {"cap mg", 1, {DICTIONARY_PERSONAL_TITLE}, 4274},
+    {"apt.o", 1, {DICTIONARY_UNIT_NUMBERED}, 4522},
+    {"d.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4292},
     {"bispo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"sl", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
     {"avenida marginal", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"quinta", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"agosto", 1, {DICTIONARY_SYNONYM}, -1},
-    {"min", 1, {DICTIONARY_PERSONAL_TITLE}, 4325},
-    {"b.po", 1, {DICTIONARY_PERSONAL_TITLE}, 4268},
-    {"r / d / c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"c.c", 1, {DICTIONARY_PLACE_NAME}, 4373},
-    {"s.g.p.s", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
-    {"fte", 1, {DICTIONARY_PLACE_NAME}, 4389},
-    {"sª", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
-    {"vigo", 1, {DICTIONARY_PERSONAL_TITLE}, 4360},
-    {"codigo postal", 1, {DICTIONARY_POSTAL_CODE}, 4411},
-    {"c r l", 1, {DICTIONARY_COMPANY_TYPE}, 4212},
-    {"prq", 1, {DICTIONARY_PLACE_NAME}, 4397},
-    {"rev.da", 1, {DICTIONARY_PERSONAL_TITLE}, 4337},
-    {"educ", 1, {DICTIONARY_SYNONYM}, 4474},
-    {"dqsa", 1, {DICTIONARY_PERSONAL_TITLE}, 4294},
-    {"arq.o", 1, {DICTIONARY_PLACE_NAME}, 4366},
-    {"s.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
-    {"cep :", 1, {DICTIONARY_POSTAL_CODE}, 4410},
-    {"estr m", 1, {DICTIONARY_STREET_TYPE}, 4441},
-    {"alameda", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"cap", 1, {DICTIONARY_PERSONAL_TITLE}, 4273},
+    {"prof.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4336},
+    {"caminho", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"n.ro", 1, {DICTIONARY_NUMBER}, 4262},
+    {"me", 1, {DICTIONARY_PERSONAL_TITLE}, 4323},
+    {"camno", 1, {DICTIONARY_STREET_TYPE}, 4438},
+    {"dtto", 1, {DICTIONARY_QUALIFIER}, 4414},
+    {"urb", 1, {DICTIONARY_STREET_TYPE}, 4467},
+    {"em ft de", 1, {DICTIONARY_STOPWORD}, 4426},
+    {"e.b", 1, {DICTIONARY_PLACE_NAME}, 4381},
+    {"s.q.", 1, {DICTIONARY_QUALIFIER}, 4418},
+    {"c.m.", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 4371},
+    {"estacao", 1, {DICTIONARY_PLACE_NAME}, 4382},
+    {"liberd.e", 1, {DICTIONARY_SYNONYM}, 4486},
+    {"ilmª", 1, {DICTIONARY_PERSONAL_TITLE}, 4310},
+    {"duque", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"marqa", 1, {DICTIONARY_PERSONAL_TITLE}, 4322},
+    {"i p", 1, {DICTIONARY_STREET_TYPE}, 4448},
     {"no", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
-    {"e.i.r.e.l.i", 1, {DICTIONARY_COMPANY_TYPE}, 4214},
-    {"resdochao", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"r", 1, {DICTIONARY_STREET_TYPE}, 4460},
-    {"c.e.p", 1, {DICTIONARY_POSTAL_CODE}, 4410},
-    {"med", 1, {DICTIONARY_PERSONAL_TITLE}, 4322},
-    {"c p", 1, {DICTIONARY_POST_OFFICE}, 4409},
-    {"out", 1, {DICTIONARY_SYNONYM}, 4486},
-    {"n.s.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
-    {"estacao de comboios", 1, {DICTIONARY_PLACE_NAME}, 4384},
-    {"dir", 1, {DICTIONARY_UNIT_DIRECTION}, 4437},
+    {"imo", 1, {DICTIONARY_PERSONAL_TITLE}, 4314},
+    {"sao", 1, {DICTIONARY_PERSONAL_TITLE}, 4345},
+    {"s", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
+    {"d", 1, {DICTIONARY_PERSONAL_TITLE}, 4291},
+    {"se", 1, {DICTIONARY_TOPONYM}, 4519},
+    {"s.r", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
+    {"o n g", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
+    {"instituto", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"s.c.s.", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
+    {"estacao de camionagem", 1, {DICTIONARY_PLACE_NAME}, 4385},
+    {"itinerario principal", 1, {DICTIONARY_STREET_TYPE}, 4448},
+    {"estação de camionagem", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"e.p", 1, {DICTIONARY_COMPANY_TYPE}, 4217},
     {"retorno", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pe", 1, {DICTIONARY_TOPONYM}, 4508},
-    {"crl", 1, {DICTIONARY_COMPANY_TYPE}, 4212},
     {"sociedade anónima", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"frei", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_STREET_TYPE}, -1},
-    {"exmª", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
+    {"urbanizacao", 1, {DICTIONARY_QUALIFIER}, 4419},
     {"seminario", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"stº", 1, {DICTIONARY_PERSONAL_TITLE}, 4342},
-    {"pça", 1, {DICTIONARY_STREET_TYPE}, 4452},
-    {"univers", 1, {DICTIONARY_PLACE_NAME}, 4407},
-    {"e m", 1, {DICTIONARY_STREET_TYPE}, 4441},
-    {"bairro", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},
-    {"sta", 1, {DICTIONARY_PERSONAL_TITLE}, 4341},
-    {"enf.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4298},
-    {"ei", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
-    {"dª", 1, {DICTIONARY_PERSONAL_TITLE}, 4290},
-    {"sc", 1, {DICTIONARY_COMPANY_TYPE}, 4234},
-    {"eng.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4300},
-    {"escola basica", 1, {DICTIONARY_PLACE_NAME}, 4379},
+    {"s lda", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"caclcadinha", 1, {DICTIONARY_STREET_TYPE}, 4437},
+    {"dep", 1, {DICTIONARY_PERSONAL_TITLE}, 4286},
+    {"entd", 1, {DICTIONARY_ENTRANCE}, 4250},
+    {"r part", 1, {DICTIONARY_STREET_TYPE}, 4463},
+    {"a c e", 1, {DICTIONARY_COMPANY_TYPE}, 4208},
+    {"fevro", 1, {DICTIONARY_SYNONYM}, 4477},
+    {"i c", 1, {DICTIONARY_STREET_TYPE}, 4447},
+    {"ava", 1, {DICTIONARY_STREET_TYPE}, 4432},
+    {"res", 1, {DICTIONARY_BUILDING_TYPE}, 4205},
     {"filho", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},
-    {"cde", 1, {DICTIONARY_PERSONAL_TITLE}, 4279},
+    {"7.bro", 1, {DICTIONARY_SYNONYM}, 4492},
+    {"rés do chão", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"capitao tenente", 1, {DICTIONARY_PERSONAL_TITLE}, 4277},
+    {"semin", 1, {DICTIONARY_PLACE_NAME}, 4408},
+    {"polícia judiciária", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"baronesa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"diacona", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"set", 1, {DICTIONARY_SYNONYM}, 4490},
-    {"o.s.c.i.p", 1, {DICTIONARY_COMPANY_TYPE}, 4221},
-    {"d.rª", 1, {DICTIONARY_PERSONAL_TITLE}, 4292},
-    {"prolng", 1, {DICTIONARY_STREET_TYPE}, 4455},
-    {"n s", 1, {DICTIONARY_PERSONAL_TITLE}, 4328},
-    {"c.e.b", 1, {DICTIONARY_PLACE_NAME}, 4374},
-    {"fonte", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"jun", 1, {DICTIONARY_SYNONYM}, 4479},
+    {"sub cv", 1, {DICTIONARY_LEVEL_SUB_BASEMENT}, 4259},
+    {"a.c.e.", 1, {DICTIONARY_COMPANY_TYPE}, 4208},
+    {"fundação pública", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"sobre loja", 1, {DICTIONARY_UNIT_STANDALONE}, -1},
+    {"para", 1, {DICTIONARY_STOPWORD}, -1},
+    {"ribra", 1, {DICTIONARY_SYNONYM}, 4490},
+    {"ce", 1, {DICTIONARY_TOPONYM}, 4499},
     {"perto daqui", 1, {DICTIONARY_NEAR}, -1},
-    {"cc", 1, {DICTIONARY_STREET_TYPE}, 4434},
-    {"tes", 1, {DICTIONARY_PERSONAL_TITLE}, 4357},
-    {"nmr.o", 1, {DICTIONARY_NUMBER}, 4260},
+    {"r.o", 1, {DICTIONARY_SYNONYM}, 4491},
+    {"capt", 1, {DICTIONARY_PERSONAL_TITLE}, 4273},
+    {"cast", 1, {DICTIONARY_PLACE_NAME}, 4374},
     {"paraná", 1, {DICTIONARY_TOPONYM}, -1},
-    {"pav", 1, {DICTIONARY_PLACE_NAME}, 4398},
-    {"general", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"s a", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
+    {"informacao", 1, {DICTIONARY_SYNONYM}, -1},
+    {"ro", 1, {DICTIONARY_TOPONYM}, 4515},
     {"perto", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
-    {"ba", 1, {DICTIONARY_TOPONYM}, 4496},
-    {"rs", 1, {DICTIONARY_STREET_TYPE}, 4462},
-    {"calçada", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"c de ep", 1, {DICTIONARY_POSTAL_CODE}, 4410},
-    {"estação de camionagem", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"s.a.d", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
-    {"madre", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sargento ajudante", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"g n r", 1, {DICTIONARY_PLACE_NAME}, 4391},
-    {"s.n.", 1, {DICTIONARY_NO_NUMBER}, 4259},
+    {"pi", 1, {DICTIONARY_LEVEL_NUMBERED}, 4253},
+    {"s.ra", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
+    {"diac", 1, {DICTIONARY_PERSONAL_TITLE}, 4289},
+    {"ms", 1, {DICTIONARY_TOPONYM}, 4505},
+    {"liberdade", 1, {DICTIONARY_SYNONYM}, -1},
+    {"senhorita", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"ema", 1, {DICTIONARY_PERSONAL_TITLE}, 4298},
+    {"cep", 1, {DICTIONARY_POSTAL_CODE}, 4412},
+    {"s.e", 1, {DICTIONARY_DIRECTIONAL}, 4247},
+    {"bv", 1, {DICTIONARY_PLACE_NAME}, 4370},
+    {"alf", 1, {DICTIONARY_PERSONAL_TITLE}, 4266},
     {"companhia anonima", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"entr", 1, {DICTIONARY_ENTRANCE}, 4248},
-    {"super quadra", 1, {DICTIONARY_QUALIFIER}, 4416},
-    {"fundacao privada", 1, {DICTIONARY_COMPANY_TYPE}, 4216},
-    {"to", 1, {DICTIONARY_TOPONYM}, 4518},
-    {"fren", 1, {DICTIONARY_UNIT_DIRECTION}, 4444},
+    {"urb", 1, {DICTIONARY_QUALIFIER}, 4419},
+    {"o.s.c.i.p.", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
+    {"senhor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"cap m g", 1, {DICTIONARY_PERSONAL_TITLE}, 4276},
     {"noredeste", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"s.c.", 1, {DICTIONARY_COMPANY_TYPE}, 4234},
-    {"entre /", 1, {DICTIONARY_CROSS_STREET}, 4239},
-    {"estacao rodoviaria", 1, {DICTIONARY_PLACE_NAME}, 4388},
-    {"numr", 1, {DICTIONARY_NUMBER}, 4260},
-    {"sem numero", 1, {DICTIONARY_NO_NUMBER}, 4259},
+    {"pr", 1, {DICTIONARY_TOPONYM}, 4509},
+    {"dist", 1, {DICTIONARY_QUALIFIER}, 4414},
+    {"sc", 1, {DICTIONARY_TOPONYM}, 4517},
+    {"l", 1, {DICTIONARY_STREET_TYPE}, 4449},
+    {"ás", 1, {DICTIONARY_STOPWORD}, -1},
     {"doutor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"n e", 1, {DICTIONARY_DIRECTIONAL}, 4242},
-    {"da", 1, {DICTIONARY_PERSONAL_TITLE}, 4290},
-    {"sr", 1, {DICTIONARY_PERSONAL_TITLE}, 4349},
-    {"comor", 1, {DICTIONARY_PERSONAL_TITLE}, 4278},
-    {"ic", 1, {DICTIONARY_STREET_TYPE}, 4445},
-    {"mstra", 1, {DICTIONARY_PERSONAL_TITLE}, 4314},
-    {"pç", 1, {DICTIONARY_STREET_TYPE}, 4452},
+    {"pj", 1, {DICTIONARY_PLACE_NAME}, 4402},
+    {"mt", 1, {DICTIONARY_TOPONYM}, 4504},
+    {"marq", 1, {DICTIONARY_PERSONAL_TITLE}, 4321},
+    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4308},
     {"tesoureiro", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"c. m.", 1, {DICTIONARY_STREET_TYPE}, 4369},
-    {"n sa", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
-    {"sc", 1, {DICTIONARY_TOPONYM}, 4515},
+    {"numero", 1, {DICTIONARY_NUMBER}, 4262},
     {"monsenhor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"p t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4255},
-    {"estr n", 1, {DICTIONARY_STREET_TYPE}, 4442},
-    {"c.p", 1, {DICTIONARY_POSTAL_CODE}, 4411},
+    {"clube desportivo", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"c.p", 1, {DICTIONARY_POST_OFFICE}, 4411},
     {"em", 3, {DICTIONARY_CROSS_STREET, DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
     {"oeste", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"maio", 1, {DICTIONARY_SYNONYM}, -1},
+    {"9br.o", 1, {DICTIONARY_SYNONYM}, 4487},
+    {"sarg ajte", 1, {DICTIONARY_PERSONAL_TITLE}, 4347},
+    {"nmrº", 1, {DICTIONARY_NUMBER}, 4262},
     {"estrada", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"maestro", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"st", 1, {DICTIONARY_PERSONAL_TITLE}, 4342},
-    {"e n", 1, {DICTIONARY_STREET_TYPE}, 4442},
-    {"estr r", 1, {DICTIONARY_STREET_TYPE}, 4443},
+    {"tr", 1, {DICTIONARY_BUILDING_TYPE}, 4206},
+    {"ma", 1, {DICTIONARY_PERSONAL_TITLE}, 4325},
     {"andar terréo", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"cp", 1, {DICTIONARY_POST_OFFICE}, 4409},
-    {"s.o", 1, {DICTIONARY_DIRECTIONAL}, 4246},
-    {"visconde", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"senhor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"qd", 1, {DICTIONARY_QUALIFIER}, 4414},
-    {"st.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4342},
-    {"9bro", 1, {DICTIONARY_SYNONYM}, 4485},
-    {"nmrº", 1, {DICTIONARY_NUMBER}, 4260},
-    {"largo", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"btl", 1, {DICTIONARY_SYNONYM}, 4471},
-    {"lg", 1, {DICTIONARY_STREET_TYPE}, 4447},
-    {"№", 1, {DICTIONARY_NUMBER}, 4260},
-    {"praca", 1, {DICTIONARY_STREET_TYPE}, 4452},
-    {"associação em sentido estrito", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"gov.dor", 1, {DICTIONARY_PERSONAL_TITLE}, 4307},
-    {"organizacao da sociedade civil de interesse publico", 1, {DICTIONARY_COMPANY_TYPE}, 4221},
-    {"proximo", 1, {DICTIONARY_NEAR}, 4258},
-    {"il.ma", 1, {DICTIONARY_PERSONAL_TITLE}, 4308},
-    {"junta", 1, {DICTIONARY_STOPWORD}, -1},
-    {"mto", 1, {DICTIONARY_PERSONAL_TITLE}, 4315},
-    {"fev", 1, {DICTIONARY_SYNONYM}, 4475},
-    {"frt", 1, {DICTIONARY_UNIT_DIRECTION}, 4444},
-    {"des", 1, {DICTIONARY_PERSONAL_TITLE}, 4285},
-    {"maranhao", 1, {DICTIONARY_TOPONYM}, 4501},
-    {"senhorita", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"s.q", 1, {DICTIONARY_QUALIFIER}, 4416},
-    {"rdvia", 1, {DICTIONARY_STREET_TYPE}, 4458},
-    {"tras", 1, {DICTIONARY_UNIT_DIRECTION}, 4519},
-    {"presidente", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"maj", 1, {DICTIONARY_PERSONAL_TITLE}, 4316},
-    {"dezb.ro", 1, {DICTIONARY_SYNONYM}, 4473},
-    {"dq", 1, {DICTIONARY_PERSONAL_TITLE}, 4293},
-    {"código de endereçamento postal", 1, {DICTIONARY_POSTAL_CODE}, -1},
-    {"tenente coronel", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"ribeiro", 1, {DICTIONARY_SYNONYM}, -1},
-    {"ex.ma", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
+    {"srta", 1, {DICTIONARY_PERSONAL_TITLE}, 4355},
+    {"e /", 1, {DICTIONARY_CROSS_STREET}, 4241},
+    {"dqa", 1, {DICTIONARY_PERSONAL_TITLE}, 4296},
+    {"profs", 1, {DICTIONARY_PERSONAL_TITLE}, 4338},
+    {"pctª", 1, {DICTIONARY_STREET_TYPE}, 4455},
+    {"ma", 1, {DICTIONARY_TOPONYM}, 4503},
+    {"estr m", 1, {DICTIONARY_STREET_TYPE}, 4443},
+    {"s.q", 1, {DICTIONARY_QUALIFIER}, 4418},
+    {"s ltda", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"apdo", 1, {DICTIONARY_POST_OFFICE}, 4410},
+    {"mtro", 1, {DICTIONARY_PERSONAL_TITLE}, 4317},
+    {"c de ep", 1, {DICTIONARY_POSTAL_CODE}, 4412},
     {"lisboa", 1, {DICTIONARY_TOPONYM}, -1},
-    {"nivel", 1, {DICTIONARY_LEVEL_NUMBERED}, 4250},
-    {"mª", 1, {DICTIONARY_PERSONAL_TITLE}, 4323},
-    {"rev.do", 1, {DICTIONARY_PERSONAL_TITLE}, 4338},
-    {"senhoras", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"associação em sentido estrito", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"n s", 1, {DICTIONARY_PERSONAL_TITLE}, 4330},
+    {"n.s.", 1, {DICTIONARY_PERSONAL_TITLE}, 4330},
+    {"secr.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4348},
+    {"s.c", 1, {DICTIONARY_COMPANY_TYPE}, 4236},
+    {"castelo", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"paraiba", 1, {DICTIONARY_TOPONYM}, 4508},
+    {"r d c ", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"9bro", 1, {DICTIONARY_SYNONYM}, 4487},
+    {"c.a", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
+    {"ave marg", 1, {DICTIONARY_STREET_TYPE}, 4433},
+    {"presidente", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"e n", 1, {DICTIONARY_STREET_TYPE}, 4444},
+    {"ribr.a", 1, {DICTIONARY_SYNONYM}, 4490},
+    {"ex.mº", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
+    {"sp", 1, {DICTIONARY_TOPONYM}, 4518},
+    {"n", 1, {DICTIONARY_STOPWORD}, 4428},
+    {"ltda", 1, {DICTIONARY_COMPANY_TYPE}, 4221},
+    {"associacao desportiva", 1, {DICTIONARY_COMPANY_TYPE}, 4209},
+    {"tenente coronel", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"estação ferroviária", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4249},
+    {"out", 1, {DICTIONARY_SYNONYM}, 4488},
+    {"abr", 1, {DICTIONARY_SYNONYM}, 4472},
+    {"sr.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
+    {"mq", 1, {DICTIONARY_PERSONAL_TITLE}, 4321},
     {"sociedade por acoes", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"mato grosso", 1, {DICTIONARY_TOPONYM}, -1},
-    {"na", 1, {DICTIONARY_STOPWORD}, 4425},
-    {"p.s.p", 1, {DICTIONARY_PLACE_NAME}, 4399},
-    {"fundacao publica", 1, {DICTIONARY_COMPANY_TYPE}, 4217},
-    {"e.t.a.r", 1, {DICTIONARY_PLACE_NAME}, 4381},
-    {"n o", 1, {DICTIONARY_DIRECTIONAL}, 4243},
+    {"v", 1, {DICTIONARY_STREET_TYPE}, 4468},
+    {"pto", 1, {DICTIONARY_SYNONYM}, 4489},
     {"vice almirante", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"c.r.l.", 1, {DICTIONARY_COMPANY_TYPE}, 4212},
-    {"esc", 1, {DICTIONARY_PLACE_NAME}, 4377},
-    {"s o", 1, {DICTIONARY_DIRECTIONAL}, 4246},
+    {"sa", 1, {DICTIONARY_COMPANY_TYPE}, 4234},
+    {"n.s.a.", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
+    {"sr.tas", 1, {DICTIONARY_PERSONAL_TITLE}, 4356},
+    {"bco", 1, {DICTIONARY_STREET_TYPE}, 4435},
     {"perto do", 1, {DICTIONARY_NEAR}, -1},
-    {"pc", 1, {DICTIONARY_STREET_TYPE}, 4452},
-    {"r.d.c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"exa", 1, {DICTIONARY_PERSONAL_TITLE}, 4302},
-    {"cons", 1, {DICTIONARY_PERSONAL_TITLE}, 4281},
-    {"c.d.", 1, {DICTIONARY_COMPANY_TYPE}, 4209},
+    {"c d", 1, {DICTIONARY_COMPANY_TYPE}, 4211},
+    {"s a", 1, {DICTIONARY_COMPANY_TYPE}, 4234},
+    {"ass", 1, {DICTIONARY_PLACE_NAME}, 4367},
+    {"esq da", 1, {DICTIONARY_CROSS_STREET}, 4240},
     {"rés-do-chão", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"rio grande do norte", 1, {DICTIONARY_TOPONYM}, -1},
+    {"autoestr", 1, {DICTIONARY_STREET_TYPE}, 4431},
+    {"no", 1, {DICTIONARY_NUMBER}, 4262},
+    {"cac", 1, {DICTIONARY_PERSONAL_TITLE}, 4272},
     {"escola", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"marques", 1, {DICTIONARY_PERSONAL_TITLE}, 4319},
-    {"transv", 1, {DICTIONARY_STREET_TYPE}, 4463},
-    {"nr.º", 1, {DICTIONARY_NUMBER}, 4260},
-    {"nª sª", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
-    {"esq da", 1, {DICTIONARY_CROSS_STREET}, 4238},
+    {"hab", 1, {DICTIONARY_BUILDING_TYPE}, 4204},
+    {"mal", 1, {DICTIONARY_PERSONAL_TITLE}, 4320},
+    {"astrada marginal", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"itinerario complementar", 1, {DICTIONARY_STREET_TYPE}, 4447},
+    {"inf", 1, {DICTIONARY_SYNONYM}, 4478},
+    {"sociedade anonima desportiva", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
+    {"s.rª", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
     {"lote", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"rodovia", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pca", 1, {DICTIONARY_STREET_TYPE}, 4452},
+    {"n", 1, {DICTIONARY_DIRECTIONAL}, 4243},
     {"companhia", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"atras", 1, {DICTIONARY_STOPWORD}, 4422},
-    {"u.l.d.a", 1, {DICTIONARY_COMPANY_TYPE}, 4235},
-    {"escadaria", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STAIRCASE}, -1},
+    {"junta", 1, {DICTIONARY_STOPWORD}, -1},
+    {"ciclo do ensino basico", 1, {DICTIONARY_PLACE_NAME}, 4376},
+    {"camara municipal", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 4371},
+    {"s / no", 1, {DICTIONARY_NO_NUMBER}, 4261},
+    {"ruinas", 1, {DICTIONARY_PLACE_NAME}, 4406},
     {"cave", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
-    {"e.i.", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
-    {"amazonas", 1, {DICTIONARY_TOPONYM}, -1},
-    {"sr.ta", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
-    {"sobre", 1, {DICTIONARY_STOPWORD}, -1},
-    {"7br.o", 1, {DICTIONARY_SYNONYM}, 4490},
+    {"oscip", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
+    {"engº", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
+    {"s.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
+    {"c.e.b.", 1, {DICTIONARY_PLACE_NAME}, 4376},
+    {"min", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
+    {"b.po", 1, {DICTIONARY_PERSONAL_TITLE}, 4270},
+    {"enfa", 1, {DICTIONARY_PERSONAL_TITLE}, 4300},
+    {"fte", 1, {DICTIONARY_PLACE_NAME}, 4391},
     {"bloco", 1, {DICTIONARY_BUILDING_TYPE}, -1},
     {"rampa", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"camno", 1, {DICTIONARY_STREET_TYPE}, 4436},
-    {"dez.bro", 1, {DICTIONARY_SYNONYM}, 4473},
-    {"castelo", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"e", 1, {DICTIONARY_DIRECTIONAL}, 4240},
-    {"e.b", 1, {DICTIONARY_PLACE_NAME}, 4379},
-    {"rev.ma", 1, {DICTIONARY_PERSONAL_TITLE}, 4339},
-    {"c.m.", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 4369},
+    {"lexa", 1, {DICTIONARY_TOPONYM}, 4493},
+    {"m.e", 1, {DICTIONARY_PERSONAL_TITLE}, 4323},
+    {"r / c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"c r l", 1, {DICTIONARY_COMPANY_TYPE}, 4214},
+    {"prq", 1, {DICTIONARY_PLACE_NAME}, 4399},
+    {"pará", 1, {DICTIONARY_TOPONYM}, -1},
+    {"educ", 1, {DICTIONARY_SYNONYM}, 4476},
+    {"sao paulo", 1, {DICTIONARY_TOPONYM}, 4518},
+    {"ceará", 1, {DICTIONARY_TOPONYM}, -1},
     {"santa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"e.b.", 1, {DICTIONARY_PLACE_NAME}, 4379},
-    {"educacao", 1, {DICTIONARY_SYNONYM}, -1},
-    {"empresa individual", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"s.l", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
+    {"dep", 1, {DICTIONARY_PLACE_NAME}, 4377},
+    {"lda", 1, {DICTIONARY_COMPANY_TYPE}, 4221},
+    {"zona", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},
+    {"bc", 1, {DICTIONARY_STREET_TYPE}, 4435},
     {"estrada nacional", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"inf", 1, {DICTIONARY_PERSONAL_TITLE}, 4310},
-    {"imo", 1, {DICTIONARY_PERSONAL_TITLE}, 4312},
-    {"sa", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
-    {"s", 1, {DICTIONARY_PERSONAL_TITLE}, 4349},
-    {"alm", 1, {DICTIONARY_PERSONAL_TITLE}, 4265},
-    {"um", 1, {DICTIONARY_STOPWORD}, -1},
-    {"se", 1, {DICTIONARY_TOPONYM}, 4517},
+    {"em.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4298},
+    {"e.i.r.e.l.i", 1, {DICTIONARY_COMPANY_TYPE}, 4216},
+    {"p j", 1, {DICTIONARY_PLACE_NAME}, 4402},
+    {"mestre", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"n.e", 1, {DICTIONARY_DIRECTIONAL}, 4244},
     {"pátio", 1, {DICTIONARY_SYNONYM}, -1},
-    {"auto estrada", 1, {DICTIONARY_STREET_TYPE}, 4429},
-    {"s.c.s.", 1, {DICTIONARY_COMPANY_TYPE}, 4228},
-    {"apdo", 1, {DICTIONARY_POST_OFFICE}, 4408},
+    {"estrada municipal", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"goias", 1, {DICTIONARY_TOPONYM}, 4502},
     {"sociedade limitada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"profa", 1, {DICTIONARY_PERSONAL_TITLE}, 4334},
-    {"av marg", 1, {DICTIONARY_STREET_TYPE}, 4431},
-    {"novembro", 1, {DICTIONARY_SYNONYM}, -1},
-    {"urbanizacao", 1, {DICTIONARY_QUALIFIER}, 4417},
-    {"ceara", 1, {DICTIONARY_TOPONYM}, 4497},
+    {"s l.da", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"pe", 1, {DICTIONARY_TOPONYM}, 4510},
+    {"do", 1, {DICTIONARY_STOPWORD}, -1},
+    {"10.bro", 1, {DICTIONARY_SYNONYM}, 4475},
+    {"codigo de enderecamento postal", 1, {DICTIONARY_POSTAL_CODE}, 4412},
+    {"pça", 1, {DICTIONARY_STREET_TYPE}, 4454},
     {"ilustrissimo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sala", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"entd", 1, {DICTIONARY_ENTRANCE}, 4248},
-    {"no", 1, {DICTIONARY_DIRECTIONAL}, 4243},
-    {"janeiro", 1, {DICTIONARY_SYNONYM}, -1},
-    {"s a", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
-    {"ruínas", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"10bro", 1, {DICTIONARY_SYNONYM}, 4475},
+    {"para", 1, {DICTIONARY_TOPONYM}, 4507},
+    {"ei", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
+    {"estacao de tratamento de aguas residuais", 1, {DICTIONARY_PLACE_NAME}, 4383},
+    {"edif", 1, {DICTIONARY_BUILDING_TYPE}, 4203},
+    {"arqo", 1, {DICTIONARY_PLACE_NAME}, 4368},
+    {"sc", 1, {DICTIONARY_COMPANY_TYPE}, 4236},
+    {"f c", 1, {DICTIONARY_COMPANY_TYPE}, 4220},
     {"sociedade em conta de participacao", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"engª", 1, {DICTIONARY_PERSONAL_TITLE}, 4302},
     {"são paulo", 1, {DICTIONARY_TOPONYM}, -1},
-    {"espirito santo", 1, {DICTIONARY_TOPONYM}, 4499},
-    {"paraíba", 1, {DICTIONARY_TOPONYM}, -1},
-    {"rdc", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"semin", 1, {DICTIONARY_PLACE_NAME}, 4406},
-    {"autoestr", 1, {DICTIONARY_STREET_TYPE}, 4429},
-    {"eng.º", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
-    {"desa", 1, {DICTIONARY_PERSONAL_TITLE}, 4286},
-    {"ribra", 1, {DICTIONARY_SYNONYM}, 4488},
-    {"c a", 1, {DICTIONARY_COMPANY_TYPE}, 4211},
-    {"f.o", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4261},
+    {"ruela", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"pcta", 1, {DICTIONARY_STREET_TYPE}, 4455},
+    {"capitao de mar e guerra", 1, {DICTIONARY_PERSONAL_TITLE}, 4276},
+    {"c de e p", 1, {DICTIONARY_POSTAL_CODE}, 4412},
+    {"mtra", 1, {DICTIONARY_PERSONAL_TITLE}, 4316},
+    {"set", 1, {DICTIONARY_SYNONYM}, 4492},
+    {"o.s.c.i.p", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
+    {"mar", 1, {DICTIONARY_PERSONAL_TITLE}, 4320},
+    {"btl", 1, {DICTIONARY_SYNONYM}, 4473},
     {"capitão tenente", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"m.al", 1, {DICTIONARY_PERSONAL_TITLE}, 4318},
+    {"cc", 1, {DICTIONARY_STREET_TYPE}, 4436},
+    {"tes", 1, {DICTIONARY_PERSONAL_TITLE}, 4359},
     {"&", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"ft", 1, {DICTIONARY_STREET_TYPE}, 4446},
     {"irmão", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"slj", 1, {DICTIONARY_UNIT_STANDALONE}, 4525},
-    {"p j", 1, {DICTIONARY_PLACE_NAME}, 4400},
-    {"minas gerais", 1, {DICTIONARY_TOPONYM}, -1},
-    {"parcela", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"pernambuco", 1, {DICTIONARY_TOPONYM}, -1},
-    {"lex.a", 1, {DICTIONARY_TOPONYM}, 4491},
-    {"volta", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"a.d", 1, {DICTIONARY_COMPANY_TYPE}, 4207},
-    {"pq", 1, {DICTIONARY_PLACE_NAME}, 4397},
-    {"s a r l", 1, {DICTIONARY_COMPANY_TYPE}, 4224},
-    {"s.ras", 1, {DICTIONARY_PERSONAL_TITLE}, 4352},
-    {"urb", 1, {DICTIONARY_QUALIFIER}, 4417},
-    {"br", 1, {DICTIONARY_PLACE_NAME}, 4367},
-    {"o.s.c.i.p.", 1, {DICTIONARY_COMPANY_TYPE}, 4221},
-    {"des.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4286},
-    {"c.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4211},
-    {"s.a", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
-    {"p.s.p.", 1, {DICTIONARY_PLACE_NAME}, 4399},
+    {"gnr", 1, {DICTIONARY_PLACE_NAME}, 4393},
+    {"patio", 1, {DICTIONARY_SYNONYM}, 4489},
+    {"scp", 1, {DICTIONARY_COMPANY_TYPE}, 4229},
+    {"habitacao", 1, {DICTIONARY_BUILDING_TYPE}, 4204},
+    {"s.a.d", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
+    {"enga", 1, {DICTIONARY_PERSONAL_TITLE}, 4302},
+    {"s.n.", 1, {DICTIONARY_NO_NUMBER}, 4261},
+    {"advogado", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"pct", 1, {DICTIONARY_STREET_TYPE}, 4455},
+    {"entr", 1, {DICTIONARY_ENTRANCE}, 4250},
+    {"roraima", 1, {DICTIONARY_TOPONYM}, -1},
+    {"st.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4343},
+    {"código de endereçamento postal", 1, {DICTIONARY_POSTAL_CODE}, -1},
+    {"b", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"fundacao privada", 1, {DICTIONARY_COMPANY_TYPE}, 4218},
+    {"calçadinha", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"norte", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"vivenda", 1, {DICTIONARY_BUILDING_TYPE}, -1},
-    {"superquadra", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"s.g.p.s.", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
+    {"sub c / v", 1, {DICTIONARY_LEVEL_SUB_BASEMENT}, 4259},
+    {"fev.ro", 1, {DICTIONARY_SYNONYM}, 4477},
+    {"estacao rodoviaria", 1, {DICTIONARY_PLACE_NAME}, 4390},
     {"companhia de responsabilidao limitada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"l", 1, {DICTIONARY_STREET_TYPE}, 4447},
+    {"ex.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4304},
     {"cambista", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"uni", 1, {DICTIONARY_PLACE_NAME}, 4407},
-    {"c.e.b.", 1, {DICTIONARY_PLACE_NAME}, 4374},
-    {"im", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
-    {"cmdt", 1, {DICTIONARY_PERSONAL_TITLE}, 4277},
-    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
-    {"bar", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ro", 1, {DICTIONARY_SYNONYM}, 4489},
-    {"prof", 1, {DICTIONARY_PERSONAL_TITLE}, 4333},
-    {"numero", 1, {DICTIONARY_NUMBER}, 4260},
-    {"organizacao nao governamental", 1, {DICTIONARY_COMPANY_TYPE}, 4220},
+    {"n e", 1, {DICTIONARY_DIRECTIONAL}, 4244},
+    {"pavilhão", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"jul", 1, {DICTIONARY_SYNONYM}, 4482},
+    {"fr", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_STREET_TYPE}, 4307},
+    {"alameda", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"lg", 1, {DICTIONARY_STREET_TYPE}, 4449},
+    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4522},
+    {"capitão de fragata", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"estrada regional", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"8.bro", 1, {DICTIONARY_SYNONYM}, 4486},
     {"frente", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT_DIRECTION}, -1},
-    {"dom", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"nov", 1, {DICTIONARY_SYNONYM}, 4485},
-    {"9br.o", 1, {DICTIONARY_SYNONYM}, 4485},
-    {"sarg ajte", 1, {DICTIONARY_PERSONAL_TITLE}, 4345},
-    {"u.l.d.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4235},
-    {"bco", 1, {DICTIONARY_STREET_TYPE}, 4433},
+    {"bar", 1, {DICTIONARY_PERSONAL_TITLE}, 4269},
+    {"empresa publica", 1, {DICTIONARY_COMPANY_TYPE}, 4217},
+    {"s.g.p.s", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
+    {"rua particular", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"s / nº", 1, {DICTIONARY_NO_NUMBER}, 4261},
+    {"comend", 1, {DICTIONARY_PERSONAL_TITLE}, 4280},
     {"e", 3, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
-    {"s.f.", 1, {DICTIONARY_COMPANY_TYPE}, 4229},
-    {"revdo", 1, {DICTIONARY_PERSONAL_TITLE}, 4338},
-    {"caminho", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"p.te", 1, {DICTIONARY_PLACE_NAME}, 4401},
-    {"estr", 1, {DICTIONARY_STREET_TYPE}, 4439},
-    {"g.al", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
-    {"srta", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
-    {"rodoanel", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"loteam", 1, {DICTIONARY_PLACE_NAME}, 4395},
-    {"profs", 1, {DICTIONARY_PERSONAL_TITLE}, 4336},
-    {"sem", 1, {DICTIONARY_PLACE_NAME}, 4406},
-    {"v", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"s ltda", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
-    {"r.c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"sao", 1, {DICTIONARY_PERSONAL_TITLE}, 4343},
-    {"mt", 1, {DICTIONARY_TOPONYM}, 4502},
-    {"mtro", 1, {DICTIONARY_PERSONAL_TITLE}, 4315},
-    {"as", 1, {DICTIONARY_STOPWORD}, 4420},
+    {"s.l", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"esq", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT_DIRECTION}, 4440},
+    {"estação", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"inf", 1, {DICTIONARY_PERSONAL_TITLE}, 4312},
+    {"ave", 1, {DICTIONARY_STREET_TYPE}, 4432},
+    {"cp", 1, {DICTIONARY_POST_OFFICE}, 4411},
+    {"sa", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
+    {"ciclo do ensino básico", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"senhoras", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"m.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4325},
+    {"r", 1, {DICTIONARY_STOPWORD}, 4429},
+    {"bl", 1, {DICTIONARY_BUILDING_TYPE}, 4202},
+    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4522},
+    {"c.d", 1, {DICTIONARY_COMPANY_TYPE}, 4211},
     {"contra almirante", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"sociedade gestora de participacoes socials", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"do", 1, {DICTIONARY_STOPWORD}, -1},
-    {"ilustrissima", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"c.r.l", 1, {DICTIONARY_COMPANY_TYPE}, 4212},
+    {"№", 1, {DICTIONARY_NUMBER}, 4262},
+    {"mta", 1, {DICTIONARY_PERSONAL_TITLE}, 4316},
+    {"esc", 1, {DICTIONARY_PLACE_NAME}, 4379},
     {"padre", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"am", 1, {DICTIONARY_TOPONYM}, 4495},
-    {"s.c", 1, {DICTIONARY_COMPANY_TYPE}, 4234},
-    {"gal", 1, {DICTIONARY_PLACE_NAME}, 4390},
-    {"enfa", 1, {DICTIONARY_PERSONAL_TITLE}, 4298},
-    {"trav", 1, {DICTIONARY_STREET_TYPE}, 4464},
-    {"clube desportivo", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"mq", 1, {DICTIONARY_PERSONAL_TITLE}, 4319},
+    {"il.ma", 1, {DICTIONARY_PERSONAL_TITLE}, 4310},
+    {"vig", 1, {DICTIONARY_PERSONAL_TITLE}, 4362},
+    {"rn", 1, {DICTIONARY_TOPONYM}, 4513},
+    {"qd", 1, {DICTIONARY_QUALIFIER}, 4416},
+    {"dezbr.o", 1, {DICTIONARY_SYNONYM}, 4475},
+    {"ad", 1, {DICTIONARY_COMPANY_TYPE}, 4209},
+    {"rondônia", 1, {DICTIONARY_TOPONYM}, -1},
     {"reverenda", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"cam", 1, {DICTIONARY_STREET_TYPE}, 4436},
-    {"b v", 1, {DICTIONARY_PLACE_NAME}, 4368},
-    {"fevro", 1, {DICTIONARY_SYNONYM}, 4475},
-    {"estação ferroviária", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"sec", 1, {DICTIONARY_PERSONAL_TITLE}, 4349},
+    {"piauí", 1, {DICTIONARY_TOPONYM}, -1},
+    {"maj", 1, {DICTIONARY_PERSONAL_TITLE}, 4318},
     {"ponto", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"s.f", 1, {DICTIONARY_COMPANY_TYPE}, 4229},
+    {"dezb.ro", 1, {DICTIONARY_SYNONYM}, 4475},
     {"março", 1, {DICTIONARY_SYNONYM}, -1},
     {"câmara municipal", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},
-    {"d'", 1, {DICTIONARY_STOPWORD}, 4423},
-    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4247},
-    {"junior", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4262},
-    {"s l", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
-    {"estação rodoviária", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"pta", 1, {DICTIONARY_UNIT_NUMBERED}, 4525},
+    {"emb", 1, {DICTIONARY_PERSONAL_TITLE}, 4297},
+    {"ulda", 1, {DICTIONARY_COMPANY_TYPE}, 4237},
+    {"#", 1, {DICTIONARY_NUMBER}, 4262},
     {"habitação", 1, {DICTIONARY_BUILDING_TYPE}, -1},
-    {"prof.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4334},
+    {"cde", 1, {DICTIONARY_PERSONAL_TITLE}, 4281},
     {"sul", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"eb", 1, {DICTIONARY_PLACE_NAME}, 4379},
-    {"debaixo", 1, {DICTIONARY_STOPWORD}, -1},
+    {"rodoanel", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"e r", 1, {DICTIONARY_STREET_TYPE}, 4445},
     {"conselheiro", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"mestra", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"n.s.", 1, {DICTIONARY_PERSONAL_TITLE}, 4328},
-    {"astrada marginal", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"gnr", 1, {DICTIONARY_PLACE_NAME}, 4391},
-    {"inf", 1, {DICTIONARY_SYNONYM}, 4476},
-    {"ex.mº", 1, {DICTIONARY_PERSONAL_TITLE}, 4304},
-    {"sa", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
-    {"deps", 1, {DICTIONARY_PLACE_NAME}, 4376},
-    {"il.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4309},
-    {"roraima", 1, {DICTIONARY_TOPONYM}, -1},
-    {"presid", 1, {DICTIONARY_PERSONAL_TITLE}, 4332},
+    {"eng.º", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
+    {"etar", 1, {DICTIONARY_PLACE_NAME}, 4383},
+    {"marques", 1, {DICTIONARY_PERSONAL_TITLE}, 4321},
+    {"mnt", 1, {DICTIONARY_SYNONYM}, 4485},
+    {"rot", 1, {DICTIONARY_STREET_TYPE}, 4461},
+    {"c.r.l.", 1, {DICTIONARY_COMPANY_TYPE}, 4214},
+    {"liberde", 1, {DICTIONARY_SYNONYM}, 4486},
+    {"volta", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"s lt.da", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"atras", 1, {DICTIONARY_STOPWORD}, 4424},
     {"perto de mim", 1, {DICTIONARY_NEAR}, -1},
-    {"en", 1, {DICTIONARY_STREET_TYPE}, 4442},
+    {"r.d.c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
     {"desembargador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"cons", 1, {DICTIONARY_PERSONAL_TITLE}, 4283},
+    {"jard", 1, {DICTIONARY_SYNONYM}, 4480},
     {"sitio", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"ciclo do ensino básico", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"csl", 1, {DICTIONARY_PLACE_NAME}, 4373},
     {"esquina da", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"estr marg", 1, {DICTIONARY_STREET_TYPE}, 4442},
     {"distrito", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"s l.da", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
-    {"hab", 1, {DICTIONARY_BUILDING_TYPE}, 4202},
-    {"pavimento terreo", 1, {DICTIONARY_LEVEL_STANDALONE}, 4255},
-    {"jan", 1, {DICTIONARY_SYNONYM}, 4477},
-    {"cel", 1, {DICTIONARY_PERSONAL_TITLE}, 4282},
-    {"c alm", 1, {DICTIONARY_PERSONAL_TITLE}, 4283},
-    {"vdessa", 1, {DICTIONARY_PERSONAL_TITLE}, 4362},
-    {"n.ª", 1, {DICTIONARY_STOPWORD}, 4425},
-    {"comp", 1, {DICTIONARY_COMPANY_TYPE}, 4210},
+    {"bairro", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},
+    {"s.c.p.", 1, {DICTIONARY_COMPANY_TYPE}, 4229},
+    {"il.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
+    {"cap tte", 1, {DICTIONARY_PERSONAL_TITLE}, 4277},
+    {"cam", 1, {DICTIONARY_STREET_TYPE}, 4438},
+    {"nr.º", 1, {DICTIONARY_NUMBER}, 4262},
+    {"s.g.p.s.", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
+    {"tunel", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"prof", 1, {DICTIONARY_PERSONAL_TITLE}, 4335},
     {"senhoritas", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"estação de ônibus", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"r", 1, {DICTIONARY_STOPWORD}, 4427},
-    {"senhores", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"engº", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
-    {"s.c.p", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
-    {"r d c ", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"d.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4290},
-    {"auto estr", 1, {DICTIONARY_STREET_TYPE}, 4429},
+    {"e p", 1, {DICTIONARY_COMPANY_TYPE}, 4217},
+    {"d'", 1, {DICTIONARY_STOPWORD}, 4425},
+    {"e.i.", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
+    {"nª", 1, {DICTIONARY_STOPWORD}, 4427},
+    {"junior", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4264},
+    {"sr.ta", 1, {DICTIONARY_PERSONAL_TITLE}, 4355},
+    {"srs", 1, {DICTIONARY_PERSONAL_TITLE}, 4352},
     {"sociedade em comandita simples", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"goias", 1, {DICTIONARY_TOPONYM}, 4500},
+    {"7br.o", 1, {DICTIONARY_SYNONYM}, 4492},
     {"sergipe", 1, {DICTIONARY_TOPONYM}, -1},
-    {"comend", 1, {DICTIONARY_PERSONAL_TITLE}, 4278},
-    {"abril", 1, {DICTIONARY_SYNONYM}, -1},
-    {"ave marg", 1, {DICTIONARY_STREET_TYPE}, 4431},
-    {"camara municipal", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 4369},
-    {"sq", 1, {DICTIONARY_QUALIFIER}, 4416},
+    {"fte", 1, {DICTIONARY_UNIT_DIRECTION}, 4446},
+    {"dez.bro", 1, {DICTIONARY_SYNONYM}, 4475},
+    {"s.ras", 1, {DICTIONARY_PERSONAL_TITLE}, 4354},
+    {"rev.ma", 1, {DICTIONARY_PERSONAL_TITLE}, 4341},
+    {"associacao em sentido estrito", 1, {DICTIONARY_COMPANY_TYPE}, 4210},
+    {"vdto", 1, {DICTIONARY_STREET_TYPE}, 4469},
     {"limitada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"s", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"lda", 1, {DICTIONARY_COMPANY_TYPE}, 4219},
-    {"nosso", 1, {DICTIONARY_STOPWORD}, -1},
-    {"st.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4341},
-    {"f.c", 1, {DICTIONARY_COMPANY_TYPE}, 4218},
-    {"em.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4296},
-    {"s.l.", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
-    {"diaca", 1, {DICTIONARY_PERSONAL_TITLE}, 4288},
-    {"lg", 1, {DICTIONARY_STREET_TYPE}, 4448},
-    {"jrd", 1, {DICTIONARY_SYNONYM}, 4478},
-    {"n.e", 1, {DICTIONARY_DIRECTIONAL}, 4242},
-    {"parana", 1, {DICTIONARY_TOPONYM}, 4507},
-    {"part", 1, {DICTIONARY_STREET_TYPE}, 4450},
-    {"o s c i p", 1, {DICTIONARY_COMPANY_TYPE}, 4221},
-    {"bombeiros voluntarios", 1, {DICTIONARY_PLACE_NAME}, 4368},
-    {"s.nº", 1, {DICTIONARY_NO_NUMBER}, 4259},
+    {"traseiro", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"estação de ônibus", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"rio de janeiro", 1, {DICTIONARY_TOPONYM}, -1},
+    {"sem", 1, {DICTIONARY_PLACE_NAME}, 4408},
+    {"núm.ro", 1, {DICTIONARY_NUMBER}, 4262},
+    {"auto estrada", 1, {DICTIONARY_STREET_TYPE}, 4431},
+    {"profas", 1, {DICTIONARY_PERSONAL_TITLE}, 4337},
+    {"alm", 1, {DICTIONARY_PERSONAL_TITLE}, 4267},
+    {"av marg", 1, {DICTIONARY_STREET_TYPE}, 4433},
+    {"bar", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"capitao de fragata", 1, {DICTIONARY_PERSONAL_TITLE}, 4275},
+    {"jz", 1, {DICTIONARY_PERSONAL_TITLE}, 4315},
     {"guarda nacional republicana", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"s.a", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
-    {"até", 1, {DICTIONARY_STOPWORD}, -1},
-    {"f.c.", 1, {DICTIONARY_COMPANY_TYPE}, 4218},
-    {"9.bro", 1, {DICTIONARY_SYNONYM}, 4485},
-    {"pda", 1, {DICTIONARY_STREET_TYPE}, 4449},
-    {"s a d", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
+    {"porta", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"s / a", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
+    {"rvia", 1, {DICTIONARY_STREET_TYPE}, 4460},
+    {"deps", 1, {DICTIONARY_PLACE_NAME}, 4378},
     {"secretaria", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"professores", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pto", 1, {DICTIONARY_SYNONYM}, 4487},
-    {"ministerio", 1, {DICTIONARY_PERSONAL_TITLE}, 4325},
+    {"ago", 1, {DICTIONARY_SYNONYM}, 4474},
+    {"ic", 1, {DICTIONARY_STREET_TYPE}, 4447},
+    {"8br.o", 1, {DICTIONARY_SYNONYM}, 4488},
+    {"sec.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4348},
     {"excelencia", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"sociedade anónima de responsabilidade limitada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"f.te", 1, {DICTIONARY_PLACE_NAME}, 4389},
-    {"brº", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4367},
-    {"engª", 1, {DICTIONARY_PERSONAL_TITLE}, 4300},
+    {"cambio", 1, {DICTIONARY_PLACE_NAME}, 4372},
+    {"largo", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"vila", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"sargto", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
-    {"jan.ro", 1, {DICTIONARY_SYNONYM}, 4477},
     {"comendador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pcta", 1, {DICTIONARY_STREET_TYPE}, 4453},
-    {"lj", 1, {DICTIONARY_PLACE_NAME}, 4393},
-    {"capt", 1, {DICTIONARY_PERSONAL_TITLE}, 4271},
+    {"pont", 1, {DICTIONARY_PLACE_NAME}, 4403},
+    {"c e b", 1, {DICTIONARY_PLACE_NAME}, 4376},
+    {"cv", 1, {DICTIONARY_LEVEL_BASEMENT}, 4251},
+    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4293},
     {"urbanização", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"exmo", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
     {"deputado", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"duquesa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"f.o", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4263},
     {"itinerário complementar", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"lexa", 1, {DICTIONARY_TOPONYM}, 4491},
-    {"zona", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},
-    {"a.c.e.", 1, {DICTIONARY_COMPANY_TYPE}, 4206},
-    {"gov", 1, {DICTIONARY_PERSONAL_TITLE}, 4307},
-    {"snº", 1, {DICTIONARY_NO_NUMBER}, 4259},
-    {"nª srª", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
+    {"enf.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4300},
+    {"des.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4288},
+    {"rdc", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
     {"rodoviaria", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"scp", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
-    {"e.p.", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
-    {"firma individual", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
-    {"pta", 1, {DICTIONARY_UNIT_NUMBERED}, 4523},
+    {"ribo", 1, {DICTIONARY_SYNONYM}, 4491},
+    {"g.n.r", 1, {DICTIONARY_PLACE_NAME}, 4393},
     {"aqui", 1, {DICTIONARY_NEAR}, -1},
-    {"enga", 1, {DICTIONARY_PERSONAL_TITLE}, 4300},
-    {"eng.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4300},
-    {"das", 1, {DICTIONARY_STOPWORD}, -1},
-    {"jard", 1, {DICTIONARY_SYNONYM}, 4478},
-    {"st.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4341},
-    {"sociedade por quotas limitada", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
-    {"ilmº", 1, {DICTIONARY_PERSONAL_TITLE}, 4309},
+    {"governador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"v.dessa", 1, {DICTIONARY_PERSONAL_TITLE}, 4364},
+    {"a d", 1, {DICTIONARY_COMPANY_TYPE}, 4209},
+    {"são", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"advo", 1, {DICTIONARY_PERSONAL_TITLE}, 4265},
+    {"s.a", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
+    {"profa", 1, {DICTIONARY_PERSONAL_TITLE}, 4336},
+    {"8bro", 1, {DICTIONARY_SYNONYM}, 4488},
+    {"ex.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
+    {"estr", 1, {DICTIONARY_STREET_TYPE}, 4441},
     {"major brigadeiro", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sub c / v", 1, {DICTIONARY_LEVEL_SUB_BASEMENT}, 4257},
-    {"arco", 1, {DICTIONARY_PERSONAL_TITLE}, 4266},
-    {"r / chao", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"rua particular", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"8br.o", 1, {DICTIONARY_SYNONYM}, 4486},
-    {"ce", 1, {DICTIONARY_TOPONYM}, 4497},
-    {"esca", 1, {DICTIONARY_STAIRCASE}, 4419},
-    {"v.dessa", 1, {DICTIONARY_PERSONAL_TITLE}, 4362},
-    {"enfo", 1, {DICTIONARY_PERSONAL_TITLE}, 4299},
-    {"sociedade fechada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"jd", 1, {DICTIONARY_SYNONYM}, 4478},
-    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4520},
-    {"e i", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
-    {"galeria", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"s.o.", 1, {DICTIONARY_DIRECTIONAL}, 4246},
-    {"m.e", 1, {DICTIONARY_PERSONAL_TITLE}, 4321},
-    {"s.rª", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
-    {"sociedade simples", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"autoestrada", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"8bro", 1, {DICTIONARY_SYNONYM}, 4486},
-    {"via", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"estacao de autocarros", 1, {DICTIONARY_PLACE_NAME}, 4382},
-    {"fte", 1, {DICTIONARY_UNIT_DIRECTION}, 4444},
-    {"s / nº", 1, {DICTIONARY_NO_NUMBER}, 4259},
-    {"condessa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"vigario", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"enfª", 1, {DICTIONARY_PERSONAL_TITLE}, 4298},
-    {"diac", 1, {DICTIONARY_PERSONAL_TITLE}, 4287},
-    {"bo", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4367},
-    {"r", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"a.c.e", 1, {DICTIONARY_COMPANY_TYPE}, 4206},
-    {"piaui", 1, {DICTIONARY_TOPONYM}, 4509},
-    {"t.te", 1, {DICTIONARY_PERSONAL_TITLE}, 4355},
-    {"c.c.", 1, {DICTIONARY_PLACE_NAME}, 4373},
-    {"goiás", 1, {DICTIONARY_TOPONYM}, -1},
-    {"m.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4323},
-    {"ass", 1, {DICTIONARY_PLACE_NAME}, 4365},
-    {"rio", 1, {DICTIONARY_STOPWORD}, -1},
-    {"apt.o", 1, {DICTIONARY_UNIT_NUMBERED}, 4520},
-    {"c.d", 1, {DICTIONARY_COMPANY_TYPE}, 4209},
-    {"sad", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
-    {"ponte", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"enf.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4299},
-    {"mai", 1, {DICTIONARY_SYNONYM}, 4482},
-    {"avenida", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"c m", 1, {DICTIONARY_PLACE_NAME}, 4369},
-    {"l", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"á", 1, {DICTIONARY_STOPWORD}, -1},
-    {"s q", 1, {DICTIONARY_QUALIFIER}, 4416},
-    {"vig", 1, {DICTIONARY_PERSONAL_TITLE}, 4360},
-    {"sa", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
-    {"s c", 1, {DICTIONARY_COMPANY_TYPE}, 4234},
-    {"organização nao governamental", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"res-do-chao", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"marquesa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"im", 1, {DICTIONARY_PERSONAL_TITLE}, 4312},
-    {"traseiro", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"ruas", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"rio grande do sul", 1, {DICTIONARY_TOPONYM}, -1},
-    {"ex.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4302},
+    {"ong", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
+    {"nª sª", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
+    {"maio", 1, {DICTIONARY_SYNONYM}, -1},
+    {"enf", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
+    {"apartamento", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"pc", 1, {DICTIONARY_STREET_TYPE}, 4454},
+    {"univ", 1, {DICTIONARY_PLACE_NAME}, 4409},
+    {"ten", 1, {DICTIONARY_PERSONAL_TITLE}, 4357},
+    {"nmro", 1, {DICTIONARY_NUMBER}, 4262},
+    {"cm", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 4371},
+    {"dezbro", 1, {DICTIONARY_SYNONYM}, 4475},
+    {"os", 1, {DICTIONARY_STOPWORD}, -1},
     {"vereador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"er", 1, {DICTIONARY_STREET_TYPE}, 4443},
+    {"sociedade simples", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"des", 1, {DICTIONARY_PERSONAL_TITLE}, 4287},
+    {"sª", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
+    {"via", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"u.l.d.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4237},
+    {"condessa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"exª", 1, {DICTIONARY_PERSONAL_TITLE}, 4304},
+    {"s.f.", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
+    {"sociedade anonima", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
+    {"b.o", 1, {DICTIONARY_PLACE_NAME}, 4369},
+    {"estação de comboios", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"r", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"g.al", 1, {DICTIONARY_PERSONAL_TITLE}, 4308},
+    {"goiás", 1, {DICTIONARY_TOPONYM}, -1},
+    {"rpart", 1, {DICTIONARY_STREET_TYPE}, 4463},
+    {"e i r e l i", 1, {DICTIONARY_COMPANY_TYPE}, 4216},
+    {"um", 1, {DICTIONARY_STOPWORD}, -1},
+    {"rev.da", 1, {DICTIONARY_PERSONAL_TITLE}, 4339},
+    {"prof.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4336},
+    {"cep :", 1, {DICTIONARY_POSTAL_CODE}, 4412},
+    {"espirito santo", 1, {DICTIONARY_TOPONYM}, 4501},
+    {"desa", 1, {DICTIONARY_PERSONAL_TITLE}, 4288},
+    {"policia judiciaria", 1, {DICTIONARY_PLACE_NAME}, 4402},
+    {"pav", 1, {DICTIONARY_PLACE_NAME}, 4400},
+    {"ponte", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"vig.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4362},
+    {"conjunto", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"avenida", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"l", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"c.r.l", 1, {DICTIONARY_COMPANY_TYPE}, 4214},
+    {"revmo", 1, {DICTIONARY_PERSONAL_TITLE}, 4342},
+    {"ne", 1, {DICTIONARY_DIRECTIONAL}, 4244},
+    {"bxs", 1, {DICTIONARY_LEVEL_STANDALONE}, 4255},
+    {"trav", 1, {DICTIONARY_STREET_TYPE}, 4466},
+    {"organização nao governamental", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"pr", 1, {DICTIONARY_PERSONAL_TITLE}, 4332},
+    {"marquesa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"batalhao", 1, {DICTIONARY_SYNONYM}, -1},
+    {"p.l.l.c", 1, {DICTIONARY_COMPANY_TYPE}, 4235},
+    {"ruas", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"s.o.", 1, {DICTIONARY_DIRECTIONAL}, 4248},
+    {"fev", 1, {DICTIONARY_SYNONYM}, 4477},
+    {"b v", 1, {DICTIONARY_PLACE_NAME}, 4370},
+    {"card", 1, {DICTIONARY_PERSONAL_TITLE}, 4278},
+    {"mstro", 1, {DICTIONARY_PERSONAL_TITLE}, 4317},
     {"mezanino", 1, {DICTIONARY_LEVEL_MEZZANINE}, -1},
     {"na", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
     {"outubro", 1, {DICTIONARY_SYNONYM}, -1},
-    {"pr", 1, {DICTIONARY_STREET_TYPE}, 4452},
-    {"ás", 1, {DICTIONARY_STOPWORD}, -1},
-    {"ulda", 1, {DICTIONARY_COMPANY_TYPE}, 4235},
-    {"#", 1, {DICTIONARY_NUMBER}, 4260},
-    {"mnte", 1, {DICTIONARY_SYNONYM}, 4483},
-    {"aptdo", 1, {DICTIONARY_POST_OFFICE}, 4408},
+    {"bpo", 1, {DICTIONARY_PERSONAL_TITLE}, 4270},
+    {"da", 1, {DICTIONARY_STOPWORD}, -1},
+    {"escnh", 1, {DICTIONARY_PLACE_NAME}, 4380},
+    {"8.bro", 1, {DICTIONARY_SYNONYM}, 4488},
+    {"govd.or", 1, {DICTIONARY_PERSONAL_TITLE}, 4309},
+    {"s n", 1, {DICTIONARY_NO_NUMBER}, 4261},
+    {"m.e", 1, {DICTIONARY_PERSONAL_TITLE}, 4326},
+    {"ex.mª", 1, {DICTIONARY_PERSONAL_TITLE}, 4305},
     {"apartado", 1, {DICTIONARY_POST_OFFICE}, -1},
     {"marechal", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"o", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_STOPWORD}, -1},
+    {"sr.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
+    {"maranhao", 1, {DICTIONARY_TOPONYM}, 4503},
     {"andar", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"drt", 1, {DICTIONARY_UNIT_DIRECTION}, 4437},
-    {"s.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
-    {"es", 1, {DICTIONARY_TOPONYM}, 4499},
-    {"dezembro", 1, {DICTIONARY_SYNONYM}, -1},
-    {"calcada", 1, {DICTIONARY_STREET_TYPE}, 4434},
-    {"jul", 1, {DICTIONARY_SYNONYM}, 4480},
+    {"vvda", 1, {DICTIONARY_BUILDING_TYPE}, 4207},
+    {"ten c.el", 1, {DICTIONARY_PERSONAL_TITLE}, 4358},
+    {"presid", 1, {DICTIONARY_PERSONAL_TITLE}, 4334},
+    {"nº", 1, {DICTIONARY_NUMBER}, 4262},
+    {"en", 1, {DICTIONARY_STREET_TYPE}, 4444},
+    {"7bro", 1, {DICTIONARY_SYNONYM}, 4492},
     {"dela", 1, {DICTIONARY_STOPWORD}, -1},
-    {"ms", 1, {DICTIONARY_TOPONYM}, 4503},
-    {"cap corv", 1, {DICTIONARY_PERSONAL_TITLE}, 4272},
-    {"exma", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
-    {"estacao de camionagem", 1, {DICTIONARY_PLACE_NAME}, 4383},
-    {"agencia bancaria", 1, {DICTIONARY_PLACE_NAME}, 4364},
+    {"pç", 1, {DICTIONARY_STREET_TYPE}, 4454},
+    {"c. m.", 1, {DICTIONARY_STREET_TYPE}, 4371},
+    {"secao", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"piaui", 1, {DICTIONARY_TOPONYM}, 4511},
+    {"dq", 1, {DICTIONARY_PERSONAL_TITLE}, 4295},
     {"número", 1, {DICTIONARY_NUMBER}, -1},
     {"nosso senhor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"p", 1, {DICTIONARY_LEVEL_NUMBERED}, 4251},
-    {"cap tte", 1, {DICTIONARY_PERSONAL_TITLE}, 4275},
+    {"eng.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4302},
+    {"e.t.a.r.", 1, {DICTIONARY_PLACE_NAME}, 4383},
+    {"trv", 1, {DICTIONARY_STREET_TYPE}, 4466},
     {"perto de", 1, {DICTIONARY_NEAR}, -1},
-    {"sr.tas", 1, {DICTIONARY_PERSONAL_TITLE}, 4354},
-    {"com.or", 1, {DICTIONARY_PERSONAL_TITLE}, 4278},
-    {"qta", 1, {DICTIONARY_STREET_TYPE}, 4456},
-    {"jr", 1, {DICTIONARY_PERSONAL_SUFFIX}, 4262},
-    {"irmao", 1, {DICTIONARY_PERSONAL_TITLE}, 4312},
+    {"p", 1, {DICTIONARY_LEVEL_NUMBERED}, 4253},
+    {"estacao ferroviaria", 1, {DICTIONARY_PLACE_NAME}, 4387},
+    {"stº", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
     {"comandante", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"mato grosso do sul", 1, {DICTIONARY_TOPONYM}, -1},
-    {"bc", 1, {DICTIONARY_STREET_TYPE}, 4433},
-    {"d.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4290},
-    {"ex.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4302},
-    {"sl", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
+    {"abril", 1, {DICTIONARY_SYNONYM}, -1},
+    {"conj", 1, {DICTIONARY_UNIT_NUMBERED}, 4523},
+    {"sn", 1, {DICTIONARY_NO_NUMBER}, 4261},
+    {"revda", 1, {DICTIONARY_PERSONAL_TITLE}, 4339},
+    {"cap mg", 1, {DICTIONARY_PERSONAL_TITLE}, 4276},
+    {"nos", 1, {DICTIONARY_STOPWORD}, -1},
     {"empresa individual de responsabilidade limitada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"n.e.", 1, {DICTIONARY_DIRECTIONAL}, 4242},
+    {"8b.ro", 1, {DICTIONARY_SYNONYM}, 4488},
     {"departamentos", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"prof.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4334},
-    {"tte", 1, {DICTIONARY_PERSONAL_TITLE}, 4355},
-    {"ro", 1, {DICTIONARY_TOPONYM}, 4513},
-    {"associacao em sentido estrito", 1, {DICTIONARY_COMPANY_TYPE}, 4208},
-    {"bl", 1, {DICTIONARY_BUILDING_TYPE}, 4200},
-    {"ac", 1, {DICTIONARY_TOPONYM}, 4492},
-    {"dezbr.o", 1, {DICTIONARY_SYNONYM}, 4473},
-    {"dto", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT_DIRECTION}, 4437},
-    {"n.s", 1, {DICTIONARY_PERSONAL_TITLE}, 4328},
+    {"auto estr", 1, {DICTIONARY_STREET_TYPE}, 4431},
+    {"policia de seguranca publica", 1, {DICTIONARY_PLACE_NAME}, 4401},
+    {"p.l.l.c.", 1, {DICTIONARY_COMPANY_TYPE}, 4235},
+    {"ba", 1, {DICTIONARY_TOPONYM}, 4498},
+    {"sec", 1, {DICTIONARY_QUALIFIER}, 4417},
+    {"un", 1, {DICTIONARY_UNIT_NUMBERED}, 4526},
+    {"enfº", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
+    {"revma", 1, {DICTIONARY_PERSONAL_TITLE}, 4341},
     {"este", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"núm.ro", 1, {DICTIONARY_NUMBER}, 4260},
-    {"lt", 1, {DICTIONARY_UNIT_NUMBERED}, 4522},
-    {"estação de trem", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"o.n.g", 1, {DICTIONARY_COMPANY_TYPE}, 4220},
+    {"s a", 1, {DICTIONARY_COMPANY_TYPE}, 4224},
+    {"mª", 1, {DICTIONARY_PERSONAL_TITLE}, 4325},
+    {"s", 1, {DICTIONARY_PERSONAL_TITLE}, 4345},
     {"ao", 1, {DICTIONARY_STOPWORD}, -1},
-    {"estação de comboios", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"r c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"num", 1, {DICTIONARY_NUMBER}, 4260},
-    {"pto", 1, {DICTIONARY_PLACE_NAME}, 4402},
-    {"s.q.", 1, {DICTIONARY_QUALIFIER}, 4416},
-    {"lug", 1, {DICTIONARY_STREET_TYPE}, 4448},
-    {"jz", 1, {DICTIONARY_PERSONAL_TITLE}, 4313},
-    {"csl", 1, {DICTIONARY_PLACE_NAME}, 4371},
-    {"l.da", 1, {DICTIONARY_COMPANY_TYPE}, 4219},
+    {"n.s", 1, {DICTIONARY_PERSONAL_TITLE}, 4330},
+    {"depto", 1, {DICTIONARY_PLACE_NAME}, 4377},
+    {"st.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4343},
+    {"arquitecto", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"med", 1, {DICTIONARY_PERSONAL_TITLE}, 4324},
+    {"ilma", 1, {DICTIONARY_PERSONAL_TITLE}, 4310},
+    {"sarl", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
+    {"slj", 1, {DICTIONARY_UNIT_STANDALONE}, 4527},
+    {"s.a", 1, {DICTIONARY_COMPANY_TYPE}, 4234},
     {"polícia de segurança pública", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ribr.o", 1, {DICTIONARY_SYNONYM}, 4489},
-    {"cap", 1, {DICTIONARY_PERSONAL_TITLE}, 4271},
-    {"nsa", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
-    {"sgps", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
-    {"s lda", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
-    {"caclcadinha", 1, {DICTIONARY_STREET_TYPE}, 4435},
-    {"cmdr", 1, {DICTIONARY_PERSONAL_TITLE}, 4278},
-    {"acre", 1, {DICTIONARY_TOPONYM}, -1},
-    {"ruinas", 1, {DICTIONARY_PLACE_NAME}, 4404},
-    {"edf", 1, {DICTIONARY_BUILDING_TYPE}, 4201},
-    {"escola básica", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"estação rodoviária", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"c m", 1, {DICTIONARY_PLACE_NAME}, 4371},
+    {"s a d", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
+    {"terreo", 1, {DICTIONARY_LEVEL_STANDALONE}, 4258},
+    {"to", 1, {DICTIONARY_TOPONYM}, 4520},
+    {"profª", 1, {DICTIONARY_PERSONAL_TITLE}, 4336},
+    {"sen", 1, {DICTIONARY_PERSONAL_TITLE}, 4350},
+    {"ministerio", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
     {"urbanizacao", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pct", 1, {DICTIONARY_STREET_TYPE}, 4453},
-    {"ljs", 1, {DICTIONARY_PLACE_NAME}, 4394},
-    {"u l d a", 1, {DICTIONARY_COMPANY_TYPE}, 4235},
+    {"c c", 1, {DICTIONARY_PLACE_NAME}, 4375},
+    {"comor", 1, {DICTIONARY_PERSONAL_TITLE}, 4280},
     {"próximo", 1, {DICTIONARY_NEAR}, -1},
-    {"c / v", 1, {DICTIONARY_LEVEL_BASEMENT}, 4249},
-    {"rr", 1, {DICTIONARY_TOPONYM}, 4514},
-    {"mar", 1, {DICTIONARY_PERSONAL_TITLE}, 4318},
-    {"cv", 1, {DICTIONARY_LEVEL_BASEMENT}, 4249},
-    {"10b.ro", 1, {DICTIONARY_SYNONYM}, 4473},
-    {"júnior", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},
+    {"nªsª", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
+    {"ex.ma", 1, {DICTIONARY_PERSONAL_TITLE}, 4305},
+    {"sargto", 1, {DICTIONARY_PERSONAL_TITLE}, 4346},
+    {"jan.ro", 1, {DICTIONARY_SYNONYM}, 4479},
+    {"eb", 1, {DICTIONARY_PLACE_NAME}, 4381},
+    {"lj", 1, {DICTIONARY_PLACE_NAME}, 4395},
+    {"am", 1, {DICTIONARY_TOPONYM}, 4497},
+    {"ve", 1, {DICTIONARY_STREET_TYPE}, 4470},
+    {"res do chao", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"nr", 1, {DICTIONARY_NUMBER}, 4262},
     {"projectada", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"excelentissimo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"scs", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
     {"defronte", 1, {DICTIONARY_STOPWORD}, -1},
     {"parque", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"esc", 1, {DICTIONARY_STAIRCASE}, 4419},
-    {"c c", 1, {DICTIONARY_PLACE_NAME}, 4373},
-    {"secra", 1, {DICTIONARY_PERSONAL_TITLE}, 4346},
+    {"educacao", 1, {DICTIONARY_SYNONYM}, -1},
+    {"gov", 1, {DICTIONARY_PERSONAL_TITLE}, 4309},
     {"n", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"prolongamento", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"c e b", 1, {DICTIONARY_PLACE_NAME}, 4374},
-    {"az", 1, {DICTIONARY_STREET_TYPE}, 4432},
-    {"sr.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
-    {"ribo", 1, {DICTIONARY_SYNONYM}, 4489},
-    {"c.m", 1, {DICTIONARY_PLACE_NAME}, 4369},
-    {"s lt.da", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
-    {"cep", 1, {DICTIONARY_POSTAL_CODE}, 4410},
-    {"s.n.c.", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
-    {"tunel", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"empresa publica", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
+    {"nas", 1, {DICTIONARY_STOPWORD}, -1},
+    {"lug", 1, {DICTIONARY_STREET_TYPE}, 4450},
+    {"e.i", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
+    {"e.p.", 1, {DICTIONARY_COMPANY_TYPE}, 4217},
+    {"maranhão", 1, {DICTIONARY_TOPONYM}, -1},
+    {"neto", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},
+    {"g n r", 1, {DICTIONARY_PLACE_NAME}, 4393},
     {"santa catarina", 1, {DICTIONARY_TOPONYM}, -1},
-    {"andar terreo", 1, {DICTIONARY_LEVEL_STANDALONE}, 4252},
-    {"fevereiro", 1, {DICTIONARY_SYNONYM}, -1},
-    {"ccnh", 1, {DICTIONARY_STREET_TYPE}, 4435},
-    {"pont", 1, {DICTIONARY_PLACE_NAME}, 4401},
-    {"advo", 1, {DICTIONARY_PERSONAL_TITLE}, 4263},
+    {"az", 1, {DICTIONARY_STREET_TYPE}, 4434},
     {"travessa", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"capitão", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"ex.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4304},
-    {"s / n", 1, {DICTIONARY_NO_NUMBER}, 4259},
-    {"pt", 1, {DICTIONARY_LEVEL_STANDALONE}, 4255},
-    {"acad", 1, {DICTIONARY_PLACE_NAME}, 4363},
-    {"p s p", 1, {DICTIONARY_PLACE_NAME}, 4399},
-    {"srª", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
-    {"s limitada", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
-    {"ex.mª", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
-    {"nmro", 1, {DICTIONARY_NUMBER}, 4260},
-    {"cm", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 4369},
-    {"cap frag", 1, {DICTIONARY_PERSONAL_TITLE}, 4273},
-    {"dezbro", 1, {DICTIONARY_SYNONYM}, 4473},
-    {"ruela", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"srtas", 1, {DICTIONARY_PERSONAL_TITLE}, 4354},
-    {"gal", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
-    {"capitao de corveta", 1, {DICTIONARY_PERSONAL_TITLE}, 4272},
-    {"rs", 1, {DICTIONARY_TOPONYM}, 4512},
+    {"sociedade por quotas limitada", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"ribro", 1, {DICTIONARY_SYNONYM}, 4491},
+    {"p t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4257},
+    {"númro", 1, {DICTIONARY_NUMBER}, 4262},
+    {"mte", 1, {DICTIONARY_SYNONYM}, 4485},
+    {"arco", 1, {DICTIONARY_PERSONAL_TITLE}, 4268},
+    {"irma", 1, {DICTIONARY_PERSONAL_TITLE}, 4313},
+    {"sem numero", 1, {DICTIONARY_NO_NUMBER}, 4261},
+    {"vdessa", 1, {DICTIONARY_PERSONAL_TITLE}, 4364},
+    {"esca", 1, {DICTIONARY_STAIRCASE}, 4421},
+    {"galeria", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"apto", 1, {DICTIONARY_UNIT_NUMBERED}, 4522},
+    {"cj", 1, {DICTIONARY_UNIT_NUMBERED}, 4523},
+    {"a", 1, {DICTIONARY_STOPWORD}, -1},
+    {"escadas", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"a.d.", 1, {DICTIONARY_COMPANY_TYPE}, 4209},
+    {"e i", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
+    {"viaduto", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"júnior", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},
     {"aqui perto", 1, {DICTIONARY_NEAR}, -1},
+    {"c.p", 1, {DICTIONARY_POSTAL_CODE}, 4413},
+    {"r / d / c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
     {"agrupamento complementar de empresas", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"universidade", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"mestre", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sao paulo", 1, {DICTIONARY_TOPONYM}, 4516},
-    {"df", 1, {DICTIONARY_TOPONYM}, 4498},
-    {"ma", 1, {DICTIONARY_PERSONAL_TITLE}, 4323},
-    {"un", 1, {DICTIONARY_UNIT_NUMBERED}, 4524},
-    {"g.n.r.", 1, {DICTIONARY_PLACE_NAME}, 4391},
-    {"n.s.a.", 1, {DICTIONARY_PERSONAL_TITLE}, 4327},
+    {"r / chao", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"arq", 1, {DICTIONARY_PLACE_NAME}, 4368},
+    {"inform", 1, {DICTIONARY_SYNONYM}, 4478},
+    {"estr r", 1, {DICTIONARY_STREET_TYPE}, 4445},
+    {"n.º", 1, {DICTIONARY_NUMBER}, 4262},
+    {"s.o", 1, {DICTIONARY_DIRECTIONAL}, 4248},
+    {"excelentissimo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"c e p", 1, {DICTIONARY_POSTAL_CODE}, 4412},
+    {"10b.ro", 1, {DICTIONARY_SYNONYM}, 4475},
     {"organização da sociedade civil de interesse público", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"e i r e l i", 1, {DICTIONARY_COMPANY_TYPE}, 4214},
-    {"sobre loja", 1, {DICTIONARY_UNIT_STANDALONE}, -1},
-    {"maj brig", 1, {DICTIONARY_PERSONAL_TITLE}, 4317},
-    {"ten cel", 1, {DICTIONARY_PERSONAL_TITLE}, 4356},
-    {"reverendissima", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"p.e", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
-    {"vig.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4360},
-    {"rio de janeiro", 1, {DICTIONARY_TOPONYM}, -1},
-    {"arquitecto", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"edif", 1, {DICTIONARY_BUILDING_TYPE}, 4201},
-    {"eireli", 1, {DICTIONARY_COMPANY_TYPE}, 4214},
-    {"proj", 1, {DICTIONARY_STREET_TYPE}, 4454},
-    {"bxs", 1, {DICTIONARY_LEVEL_STANDALONE}, 4253},
+    {"praceta", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"rj", 1, {DICTIONARY_TOPONYM}, 4512},
+    {"s.l.", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"estacao de autocarros", 1, {DICTIONARY_PLACE_NAME}, 4384},
+    {"escadaria", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STAIRCASE}, -1},
+    {"sad", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
+    {"cxp", 1, {DICTIONARY_POST_OFFICE}, 4411},
+    {"m.al", 1, {DICTIONARY_PERSONAL_TITLE}, 4320},
+    {"c.e.p", 1, {DICTIONARY_POSTAL_CODE}, 4412},
+    {"s q", 1, {DICTIONARY_QUALIFIER}, 4418},
+    {"part", 1, {DICTIONARY_STREET_TYPE}, 4452},
+    {"lt.da", 1, {DICTIONARY_COMPANY_TYPE}, 4221},
+    {"a t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
+    {"rdvia", 1, {DICTIONARY_STREET_TYPE}, 4460},
+    {"estacao de trem", 1, {DICTIONARY_PLACE_NAME}, 4389},
     {"sudoeste", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"etar", 1, {DICTIONARY_PLACE_NAME}, 4381},
-    {"estrada municipal", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"go", 1, {DICTIONARY_TOPONYM}, 4500},
-    {"c.a", 1, {DICTIONARY_COMPANY_TYPE}, 4211},
-    {"p.l.l.c", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"s c", 1, {DICTIONARY_COMPANY_TYPE}, 4236},
+    {"viela", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"mar", 1, {DICTIONARY_SYNONYM}, 4483},
+    {"im", 1, {DICTIONARY_PERSONAL_TITLE}, 4314},
+    {"cap ten", 1, {DICTIONARY_PERSONAL_TITLE}, 4277},
     {"enfermeira", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"dep", 1, {DICTIONARY_PLACE_NAME}, 4375},
     {"de", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
     {"departamento", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"enf.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4300},
     {"sociedade em comum", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"uma", 1, {DICTIONARY_STOPWORD}, -1},
-    {"cast", 1, {DICTIONARY_PLACE_NAME}, 4372},
-    {"s / c / v", 1, {DICTIONARY_LEVEL_SUB_BASEMENT}, 4257},
-    {"bpo", 1, {DICTIONARY_PERSONAL_TITLE}, 4268},
-    {"7.bro", 1, {DICTIONARY_SYNONYM}, 4490},
-    {"numro", 1, {DICTIONARY_NUMBER}, 4260},
+    {"dª", 1, {DICTIONARY_PERSONAL_TITLE}, 4292},
+    {"s.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4224},
+    {"nmr.o", 1, {DICTIONARY_NUMBER}, 4262},
+    {"fevereiro", 1, {DICTIONARY_SYNONYM}, -1},
+    {"div", 1, {DICTIONARY_QUALIFIER}, 4415},
+    {"pr", 1, {DICTIONARY_STREET_TYPE}, 4454},
     {"sub cave", 1, {DICTIONARY_LEVEL_SUB_BASEMENT}, -1},
-    {"s / a", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
+    {"nivel", 1, {DICTIONARY_LEVEL_NUMBERED}, 4252},
     {"engenheiro", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"reverendo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"m.e", 1, {DICTIONARY_PERSONAL_TITLE}, 4324},
-    {"maestra", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sec", 1, {DICTIONARY_QUALIFIER}, 4415},
-    {"v", 1, {DICTIONARY_STREET_TYPE}, 4466},
+    {"rev.do", 1, {DICTIONARY_PERSONAL_TITLE}, 4340},
+    {"porto", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"estação de trem", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"brigadeiro", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"irmã", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"maranhão", 1, {DICTIONARY_TOPONYM}, -1},
-    {"pnte", 1, {DICTIONARY_PLACE_NAME}, 4401},
-    {"pailhao", 1, {DICTIONARY_PLACE_NAME}, 4398},
-    {"vvda", 1, {DICTIONARY_BUILDING_TYPE}, 4205},
-    {"rot", 1, {DICTIONARY_STREET_TYPE}, 4459},
+    {"num.ro", 1, {DICTIONARY_NUMBER}, 4262},
     {"tenente", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"eng.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
-    {"duque", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"7b.ro", 1, {DICTIONARY_SYNONYM}, 4490},
-    {"nº", 1, {DICTIONARY_NUMBER}, 4260},
-    {"rés do chão", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"sa", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
-    {"rj", 1, {DICTIONARY_TOPONYM}, 4510},
-    {"mons", 1, {DICTIONARY_PERSONAL_TITLE}, 4326},
-    {"pi", 1, {DICTIONARY_TOPONYM}, 4509},
-    {"distrito federal", 1, {DICTIONARY_TOPONYM}, -1},
-    {"eminencia", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"estacao de tratamento de aguas residuais", 1, {DICTIONARY_PLACE_NAME}, 4381},
-    {"e.t.a.r.", 1, {DICTIONARY_PLACE_NAME}, 4381},
-    {"vl", 1, {DICTIONARY_STREET_TYPE}, 4469},
-    {"professor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"r.o", 1, {DICTIONARY_SYNONYM}, 4489},
-    {"estacao ferroviaria", 1, {DICTIONARY_PLACE_NAME}, 4385},
-    {"letra", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"ema", 1, {DICTIONARY_PERSONAL_TITLE}, 4296},
-    {"c de e p", 1, {DICTIONARY_POSTAL_CODE}, 4410},
-    {"n.o", 1, {DICTIONARY_DIRECTIONAL}, 4243},
-    {"s.a.r.l.", 1, {DICTIONARY_COMPANY_TYPE}, 4224},
-    {"itinerario complementar", 1, {DICTIONARY_STREET_TYPE}, 4445},
-    {"8b.ro", 1, {DICTIONARY_SYNONYM}, 4486},
-    {"conj", 1, {DICTIONARY_UNIT_NUMBERED}, 4521},
-    {"sn", 1, {DICTIONARY_NO_NUMBER}, 4259},
-    {"s / no", 1, {DICTIONARY_NO_NUMBER}, 4259},
-    {"7bro", 1, {DICTIONARY_SYNONYM}, 4490},
-    {"estação de autocarros", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"s a", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
-    {"s g p s", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
-    {"reverendissimo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"m.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4323},
-    {"liberde", 1, {DICTIONARY_SYNONYM}, 4484},
-    {"porta", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"p.l.l.c.", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
-    {"embaixador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"qu", 1, {DICTIONARY_STREET_TYPE}, 4456},
-    {"oscip", 1, {DICTIONARY_COMPANY_TYPE}, 4221},
-    {"mta", 1, {DICTIONARY_PERSONAL_TITLE}, 4314},
-    {"dqa", 1, {DICTIONARY_PERSONAL_TITLE}, 4294},
-    {"rondônia", 1, {DICTIONARY_TOPONYM}, -1},
-    {"d'", 1, {DICTIONARY_ELISION}, -1},
-    {"neto", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},
-    {"escadinhas", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"b.o", 1, {DICTIONARY_PLACE_NAME}, 4367},
-    {"ace", 1, {DICTIONARY_COMPANY_TYPE}, 4206},
-    {"s", 1, {DICTIONARY_PERSONAL_TITLE}, 4343},
+    {"fonte", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"amapá", 1, {DICTIONARY_TOPONYM}, -1},
+    {"paraíba", 1, {DICTIONARY_TOPONYM}, -1},
+    {"dra", 1, {DICTIONARY_PERSONAL_TITLE}, 4294},
+    {"pca", 1, {DICTIONARY_STREET_TYPE}, 4454},
+    {"a.d", 1, {DICTIONARY_COMPANY_TYPE}, 4209},
+    {"pailhao", 1, {DICTIONARY_PLACE_NAME}, 4400},
+    {"rs", 1, {DICTIONARY_STREET_TYPE}, 4464},
+    {"jan", 1, {DICTIONARY_SYNONYM}, 4479},
     {"moradia", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"eminencia", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"estacao de comboios", 1, {DICTIONARY_PLACE_NAME}, 4386},
+    {"gov.dor", 1, {DICTIONARY_PERSONAL_TITLE}, 4309},
+    {"professor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"emmo", 1, {DICTIONARY_PERSONAL_TITLE}, 4299},
+    {"qta", 1, {DICTIONARY_STREET_TYPE}, 4458},
+    {"acad", 1, {DICTIONARY_PLACE_NAME}, 4365},
+    {"parq", 1, {DICTIONARY_PLACE_NAME}, 4399},
+    {"mstra", 1, {DICTIONARY_PERSONAL_TITLE}, 4316},
+    {"autoestrada", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"nosso", 1, {DICTIONARY_STOPWORD}, -1},
+    {"empresa individual", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"v alm", 1, {DICTIONARY_PERSONAL_TITLE}, 4361},
+    {"deptos", 1, {DICTIONARY_PLACE_NAME}, 4378},
+    {"estação de autocarros", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"da", 1, {DICTIONARY_PERSONAL_TITLE}, 4292},
+    {"pto", 1, {DICTIONARY_STREET_TYPE}, 4453},
+    {"reverendissimo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"c.m", 1, {DICTIONARY_PLACE_NAME}, 4371},
+    {"esq", 1, {DICTIONARY_CROSS_STREET}, 4238},
+    {"p.j", 1, {DICTIONARY_PLACE_NAME}, 4402},
+    {"visconde", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"embaixador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"debaixo", 1, {DICTIONARY_STOPWORD}, -1},
+    {"srª", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
+    {"o s c i p", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
+    {"at", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
+    {"e.b.", 1, {DICTIONARY_PLACE_NAME}, 4381},
+    {"dto", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT_DIRECTION}, 4439},
+    {"d'", 1, {DICTIONARY_ELISION}, -1},
+    {"psp", 1, {DICTIONARY_PLACE_NAME}, 4401},
+    {"mestra", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"escadinhas", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"jd", 1, {DICTIONARY_SYNONYM}, 4480},
+    {"a.c.e", 1, {DICTIONARY_COMPANY_TYPE}, 4208},
+    {"o.n.g", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
+    {"mus", 1, {DICTIONARY_PLACE_NAME}, 4398},
+    {"senhores", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"st.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
+    {"na esq de", 1, {DICTIONARY_CROSS_STREET}, 4239},
     {"com", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
-    {"rdv", 1, {DICTIONARY_PLACE_NAME}, 4403},
-    {"imº", 1, {DICTIONARY_PERSONAL_TITLE}, 4312},
-    {"ilma", 1, {DICTIONARY_PERSONAL_TITLE}, 4308},
-    {"instituto", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"drª", 1, {DICTIONARY_PERSONAL_TITLE}, 4292},
-    {"sarl", 1, {DICTIONARY_COMPANY_TYPE}, 4224},
+    {"num", 1, {DICTIONARY_NUMBER}, 4262},
+    {"r.a", 1, {DICTIONARY_SYNONYM}, 4490},
+    {"até", 1, {DICTIONARY_STOPWORD}, -1},
+    {"ten cel", 1, {DICTIONARY_PERSONAL_TITLE}, 4358},
+    {"s f", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
+    {"janeiro", 1, {DICTIONARY_SYNONYM}, -1},
+    {"proj", 1, {DICTIONARY_STREET_TYPE}, 4456},
+    {"l.da", 1, {DICTIONARY_COMPANY_TYPE}, 4221},
     {"quadra", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"ad", 1, {DICTIONARY_COMPANY_TYPE}, 4207},
-    {"urb", 1, {DICTIONARY_STREET_TYPE}, 4465},
-    {"s.a", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
-    {"codigo de enderecamento postal", 1, {DICTIONARY_POSTAL_CODE}, 4410},
-    {"zn", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4418},
-    {"nª", 1, {DICTIONARY_STOPWORD}, 4425},
-    {"il.mª", 1, {DICTIONARY_PERSONAL_TITLE}, 4308},
-    {"r/r / chão", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"secr.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4346},
-    {"estacao de trem", 1, {DICTIONARY_PLACE_NAME}, 4387},
-    {"sen", 1, {DICTIONARY_PERSONAL_TITLE}, 4348},
-    {"ate", 1, {DICTIONARY_STOPWORD}, 4421},
-    {"mar", 1, {DICTIONARY_SYNONYM}, 4481},
-    {"museu", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"estacao", 1, {DICTIONARY_PLACE_NAME}, 4380},
-    {"s.rs", 1, {DICTIONARY_PERSONAL_TITLE}, 4350},
-    {"rod", 1, {DICTIONARY_STREET_TYPE}, 4458},
-    {"mtra", 1, {DICTIONARY_PERSONAL_TITLE}, 4314},
-    {"ve", 1, {DICTIONARY_STREET_TYPE}, 4468},
-    {"ltda", 1, {DICTIONARY_COMPANY_TYPE}, 4219},
-    {"associacao desportiva", 1, {DICTIONARY_COMPANY_TYPE}, 4207},
-    {"nr", 1, {DICTIONARY_NUMBER}, 4260},
-    {"brig", 1, {DICTIONARY_PERSONAL_TITLE}, 4269},
-    {"scs", 1, {DICTIONARY_COMPANY_TYPE}, 4228},
-    {"div", 1, {DICTIONARY_QUALIFIER}, 4413},
+    {"ribr.o", 1, {DICTIONARY_SYNONYM}, 4491},
+    {"calçada", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"sala", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"amazonas", 1, {DICTIONARY_TOPONYM}, -1},
+    {"proximo", 1, {DICTIONARY_NEAR}, 4260},
+    {"ep", 1, {DICTIONARY_COMPANY_TYPE}, 4217},
+    {"b", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4369},
+    {"dez", 1, {DICTIONARY_SYNONYM}, 4475},
+    {"edf", 1, {DICTIONARY_BUILDING_TYPE}, 4203},
+    {"o", 1, {DICTIONARY_DIRECTIONAL}, 4246},
+    {"snc", 1, {DICTIONARY_COMPANY_TYPE}, 4228},
+    {"mqsa", 1, {DICTIONARY_PERSONAL_TITLE}, 4322},
+    {"bombeiros voluntarios", 1, {DICTIONARY_PLACE_NAME}, 4370},
+    {"doutora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"u l d a", 1, {DICTIONARY_COMPANY_TYPE}, 4237},
+    {"c / v", 1, {DICTIONARY_LEVEL_BASEMENT}, 4251},
+    {"f.te", 1, {DICTIONARY_PLACE_NAME}, 4391},
+    {"capitão", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"capitao de corveta", 1, {DICTIONARY_PERSONAL_TITLE}, 4274},
+    {"loteam", 1, {DICTIONARY_PLACE_NAME}, 4397},
+    {"ruínas", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"s.a.d.", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
+    {"c a", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
     {"pavimento terréo", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"rpart", 1, {DICTIONARY_STREET_TYPE}, 4461},
     {"barao", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"lg", 1, {DICTIONARY_STREET_TYPE}, 4450},
     {"câmbio", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"c e p", 1, {DICTIONARY_POSTAL_CODE}, 4410},
-    {"scv", 1, {DICTIONARY_LEVEL_SUB_BASEMENT}, 4257},
-    {"cj", 1, {DICTIONARY_UNIT_NUMBERED}, 4521},
-    {"aeroporto", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ten c.el", 1, {DICTIONARY_PERSONAL_TITLE}, 4356},
-    {"e.i", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
+    {"agencia bancaria", 1, {DICTIONARY_PLACE_NAME}, 4366},
+    {"sf", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
+    {"arq.o", 1, {DICTIONARY_PLACE_NAME}, 4368},
+    {"sa", 1, {DICTIONARY_COMPANY_TYPE}, 4224},
+    {"pt", 1, {DICTIONARY_LEVEL_STANDALONE}, 4257},
     {"sudeste", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"trv", 1, {DICTIONARY_STREET_TYPE}, 4464},
+    {"s o", 1, {DICTIONARY_DIRECTIONAL}, 4248},
     {"sport clube", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"habitacao", 1, {DICTIONARY_BUILDING_TYPE}, 4202},
-    {"revda", 1, {DICTIONARY_PERSONAL_TITLE}, 4337},
+    {"mons", 1, {DICTIONARY_PERSONAL_TITLE}, 4328},
     {"transversal", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"i c", 1, {DICTIONARY_STREET_TYPE}, 4445},
-    {"p l l c", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
-    {"pe", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
+    {"exa", 1, {DICTIONARY_PERSONAL_TITLE}, 4304},
+    {"andar terreo", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
+    {"pto", 1, {DICTIONARY_PLACE_NAME}, 4404},
     {"pastor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"mte", 1, {DICTIONARY_SYNONYM}, 4483},
-    {"capitao tenente", 1, {DICTIONARY_PERSONAL_TITLE}, 4275},
-    {"da", 1, {DICTIONARY_STOPWORD}, -1},
-    {"card", 1, {DICTIONARY_PERSONAL_TITLE}, 4276},
-    {"númro", 1, {DICTIONARY_NUMBER}, 4260},
-    {"vdto", 1, {DICTIONARY_STREET_TYPE}, 4467},
-    {"fev.ro", 1, {DICTIONARY_SYNONYM}, 4475},
+    {"stª", 1, {DICTIONARY_PERSONAL_TITLE}, 4343},
+    {"ljs", 1, {DICTIONARY_PLACE_NAME}, 4396},
+    {"c.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
+    {"maestra", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"calcada", 1, {DICTIONARY_STREET_TYPE}, 4436},
+    {"govdor", 1, {DICTIONARY_PERSONAL_TITLE}, 4309},
+    {"adv.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4265},
     {"nossa", 1, {DICTIONARY_STOPWORD}, -1},
-    {"eng", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
-    {"cc", 1, {DICTIONARY_PLACE_NAME}, 4373},
+    {"d.ra", 1, {DICTIONARY_PERSONAL_TITLE}, 4294},
+    {"uni", 1, {DICTIONARY_PLACE_NAME}, 4409},
     {"piso", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"tocantins", 1, {DICTIONARY_TOPONYM}, -1},
-    {"pa", 1, {DICTIONARY_TOPONYM}, 4505},
-    {"doutora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"v alm", 1, {DICTIONARY_PERSONAL_TITLE}, 4359},
-    {"o.n.g.", 1, {DICTIONARY_COMPANY_TYPE}, 4220},
-    {"bar", 1, {DICTIONARY_PERSONAL_TITLE}, 4267},
-    {"cdessa", 1, {DICTIONARY_PERSONAL_TITLE}, 4280},
-    {"profas", 1, {DICTIONARY_PERSONAL_TITLE}, 4335},
-    {"inform", 1, {DICTIONARY_SYNONYM}, 4476},
+    {"s limitada", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"pnto", 1, {DICTIONARY_STREET_TYPE}, 4453},
+    {"cap frag", 1, {DICTIONARY_PERSONAL_TITLE}, 4275},
+    {"loteamento", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"transv", 1, {DICTIONARY_STREET_TYPE}, 4465},
+    {"v", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"gal", 1, {DICTIONARY_PERSONAL_TITLE}, 4308},
+    {"rs", 1, {DICTIONARY_TOPONYM}, 4514},
+    {"ret", 1, {DICTIONARY_STREET_TYPE}, 4459},
+    {"n sra", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
     {"desembargadora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"vd", 1, {DICTIONARY_STREET_TYPE}, 4467},
-    {"terreo", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
-    {"porto", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"apartamento", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"secr", 1, {DICTIONARY_PERSONAL_TITLE}, 4347},
-    {"exmo", 1, {DICTIONARY_PERSONAL_TITLE}, 4304},
-    {"n.º", 1, {DICTIONARY_NUMBER}, 4260},
-    {"10bro", 1, {DICTIONARY_SYNONYM}, 4473},
-    {"governador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"abr", 1, {DICTIONARY_SYNONYM}, 4470},
-    {"pctª", 1, {DICTIONARY_STREET_TYPE}, 4453},
-    {"tv", 1, {DICTIONARY_STREET_TYPE}, 4464},
+    {"t.te c.el", 1, {DICTIONARY_PERSONAL_TITLE}, 4358},
+    {"universidade", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"viscondesa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"visc", 1, {DICTIONARY_PERSONAL_TITLE}, 4363},
+    {"revdo", 1, {DICTIONARY_PERSONAL_TITLE}, 4340},
+    {"s.n.c.", 1, {DICTIONARY_COMPANY_TYPE}, 4228},
+    {"rio grande do sul", 1, {DICTIONARY_TOPONYM}, -1},
+    {"mai", 1, {DICTIONARY_SYNONYM}, 4484},
+    {"q", 1, {DICTIONARY_QUALIFIER}, 4416},
+    {"rev.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4342},
+    {"ilmo", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
+    {"irmao", 1, {DICTIONARY_PERSONAL_TITLE}, 4314},
+    {"v.de", 1, {DICTIONARY_PERSONAL_TITLE}, 4363},
     {"enfermeiro", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"academia", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"cd", 1, {DICTIONARY_COMPANY_TYPE}, 4209},
+    {"maj brig", 1, {DICTIONARY_PERSONAL_TITLE}, 4319},
+    {"mg", 1, {DICTIONARY_TOPONYM}, 4506},
+    {"nov", 1, {DICTIONARY_SYNONYM}, 4487},
+    {"p.t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4257},
     {"código postal", 1, {DICTIONARY_POSTAL_CODE}, -1},
-    {"enfº", 1, {DICTIONARY_PERSONAL_TITLE}, 4299},
-    {"em", 1, {DICTIONARY_STREET_TYPE}, 4441},
+    {"exmº", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
+    {"av", 1, {DICTIONARY_STREET_TYPE}, 4432},
+    {"p.e", 1, {DICTIONARY_PERSONAL_TITLE}, 4331},
+    {"pq", 1, {DICTIONARY_PLACE_NAME}, 4399},
     {"q", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"i p", 1, {DICTIONARY_STREET_TYPE}, 4446},
-    {"10br.o", 1, {DICTIONARY_SYNONYM}, 4473},
-    {"e.p", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
-    {"rn", 1, {DICTIONARY_TOPONYM}, 4511},
-    {"a t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4252},
-    {"av", 1, {DICTIONARY_STREET_TYPE}, 4430},
-    {"vde", 1, {DICTIONARY_PERSONAL_TITLE}, 4361},
+    {"exmª", 1, {DICTIONARY_PERSONAL_TITLE}, 4305},
+    {"se", 1, {DICTIONARY_DIRECTIONAL}, 4247},
+    {"s a r l", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
+    {"rdv", 1, {DICTIONARY_PLACE_NAME}, 4405},
+    {"e t a r", 1, {DICTIONARY_PLACE_NAME}, 4383},
+    {"ra", 1, {DICTIONARY_SYNONYM}, 4490},
     {"capitão de mar e guerra", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"monte", 1, {DICTIONARY_SYNONYM}, -1},
-    {"policia de seguranca publica", 1, {DICTIONARY_PLACE_NAME}, 4399},
-    {"ciclo do ensino basico", 1, {DICTIONARY_PLACE_NAME}, 4374},
-    {"cap ten", 1, {DICTIONARY_PERSONAL_TITLE}, 4275},
-    {"escadas", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"sec", 1, {DICTIONARY_PERSONAL_TITLE}, 4347},
+    {"sto", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
+    {"go", 1, {DICTIONARY_TOPONYM}, 4502},
+    {"df", 1, {DICTIONARY_TOPONYM}, 4500},
+    {"capitao", 1, {DICTIONARY_PERSONAL_TITLE}, 4273},
     {"fundação privada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"me", 1, {DICTIONARY_PERSONAL_TITLE}, 4324},
-    {"e b", 1, {DICTIONARY_PLACE_NAME}, 4379},
-    {"sra", 1, {DICTIONARY_PERSONAL_TITLE}, 4351},
-    {"conde", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"fc", 1, {DICTIONARY_COMPANY_TYPE}, 4218},
-    {"f c", 1, {DICTIONARY_COMPANY_TYPE}, 4218},
-    {"sociedade anonima de responsabilidade limitada", 1, {DICTIONARY_COMPANY_TYPE}, 4224},
-    {"emb", 1, {DICTIONARY_PERSONAL_TITLE}, 4295},
-    {"centro comercial", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"lx.a", 1, {DICTIONARY_TOPONYM}, 4491},
+    {"no", 1, {DICTIONARY_DIRECTIONAL}, 4245},
+    {"c.c.", 1, {DICTIONARY_PLACE_NAME}, 4375},
+    {"al", 1, {DICTIONARY_STREET_TYPE}, 4430},
+    {"s / c / v", 1, {DICTIONARY_LEVEL_SUB_BASEMENT}, 4259},
+    {"coronel", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"vv", 1, {DICTIONARY_BUILDING_TYPE}, 4207},
+    {"numro", 1, {DICTIONARY_NUMBER}, 4262},
+    {"brg", 1, {DICTIONARY_PERSONAL_TITLE}, 4271},
+    {"ex.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4304},
+    {"me", 1, {DICTIONARY_PERSONAL_TITLE}, 4326},
     {"arcebispo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"capitao de mar e guerra", 1, {DICTIONARY_PERSONAL_TITLE}, 4274},
-    {"sras", 1, {DICTIONARY_PERSONAL_TITLE}, 4352},
     {"alagoas", 1, {DICTIONARY_TOPONYM}, -1},
-    {"e r", 1, {DICTIONARY_STREET_TYPE}, 4443},
-    {"pb", 1, {DICTIONARY_TOPONYM}, 4506},
-    {"ava", 1, {DICTIONARY_STREET_TYPE}, 4430},
-    {"d", 1, {DICTIONARY_PERSONAL_TITLE}, 4289},
-    {"c p", 1, {DICTIONARY_POSTAL_CODE}, 4411},
-    {"janero", 1, {DICTIONARY_SYNONYM}, 4477},
-    {"num.ro", 1, {DICTIONARY_NUMBER}, 4260},
-    {"terminal rodoviario", 1, {DICTIONARY_PLACE_NAME}, 4405},
-    {"govd.or", 1, {DICTIONARY_PERSONAL_TITLE}, 4307},
-    {"rc", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"mal", 1, {DICTIONARY_PERSONAL_TITLE}, 4318},
-    {"s.n.c", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
-    {"nro", 1, {DICTIONARY_NUMBER}, 4260},
-    {"sgto", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
+    {"lex.a", 1, {DICTIONARY_TOPONYM}, 4493},
+    {"c p", 1, {DICTIONARY_POST_OFFICE}, 4411},
+    {"pnte", 1, {DICTIONARY_PLACE_NAME}, 4403},
+    {"terminal rodoviário", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"escola basica", 1, {DICTIONARY_PLACE_NAME}, 4381},
+    {"pa", 1, {DICTIONARY_TOPONYM}, 4507},
+    {"exma", 1, {DICTIONARY_PERSONAL_TITLE}, 4305},
+    {"eng.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
+    {"major", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"7b.ro", 1, {DICTIONARY_SYNONYM}, 4492},
+    {"p.s.p", 1, {DICTIONARY_PLACE_NAME}, 4401},
+    {"so", 1, {DICTIONARY_DIRECTIONAL}, 4248},
+    {"dir", 1, {DICTIONARY_UNIT_DIRECTION}, 4439},
+    {"dqsa", 1, {DICTIONARY_PERSONAL_TITLE}, 4296},
+    {"professora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"sarg", 1, {DICTIONARY_PERSONAL_TITLE}, 4346},
     {"juiz", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"noroeste", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"ribr.a", 1, {DICTIONARY_SYNONYM}, 4488},
+    {"o.n.g.", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
     {"senador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"s.c.p.", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
-    {"ceará", 1, {DICTIONARY_TOPONYM}, -1},
-    {"a", 1, {DICTIONARY_STOPWORD}, -1},
-    {"emmo", 1, {DICTIONARY_PERSONAL_TITLE}, 4297},
+    {"il.mª", 1, {DICTIONARY_PERSONAL_TITLE}, 4310},
+    {"enf.º", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
+    {"s l", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"vl", 1, {DICTIONARY_STREET_TYPE}, 4471},
+    {"lx.a", 1, {DICTIONARY_TOPONYM}, 4493},
+    {"edificio", 1, {DICTIONARY_BUILDING_TYPE}, 4203},
+    {"e.t.a.r", 1, {DICTIONARY_PLACE_NAME}, 4383},
+    {"c alm", 1, {DICTIONARY_PERSONAL_TITLE}, 4285},
     {"marquês", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"entre", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
     {"sociedade aberta", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"pnto", 1, {DICTIONARY_STREET_TYPE}, 4451},
-    {"arc.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4266},
-    {"parq", 1, {DICTIONARY_PLACE_NAME}, 4397},
-    {"em.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4297},
-    {"polícia judiciária", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"deptos", 1, {DICTIONARY_PLACE_NAME}, 4376},
-    {"s.r", 1, {DICTIONARY_PERSONAL_TITLE}, 4349},
-    {"para", 1, {DICTIONARY_TOPONYM}, 4505},
-    {"rvia", 1, {DICTIONARY_STREET_TYPE}, 4458},
-    {"informacao", 1, {DICTIONARY_SYNONYM}, -1},
-    {"inst", 1, {DICTIONARY_PLACE_NAME}, 4392},
-    {"ns", 1, {DICTIONARY_PERSONAL_TITLE}, 4328},
-    {"esq", 1, {DICTIONARY_CROSS_STREET}, 4236},
+    {"il.mº", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
+    {"s e", 1, {DICTIONARY_DIRECTIONAL}, 4247},
+    {"n.o", 1, {DICTIONARY_DIRECTIONAL}, 4245},
+    {"s.a.r.l.", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
+    {"comp", 1, {DICTIONARY_COMPANY_TYPE}, 4212},
+    {"e", 1, {DICTIONARY_DIRECTIONAL}, 4242},
+    {"9.bro", 1, {DICTIONARY_SYNONYM}, 4487},
+    {"ver", 1, {DICTIONARY_PERSONAL_TITLE}, 4360},
+    {"julho", 1, {DICTIONARY_SYNONYM}, -1},
+    {"s.c.p", 1, {DICTIONARY_COMPANY_TYPE}, 4229},
+    {"ca", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
+    {"s g p s", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
+    {"pb", 1, {DICTIONARY_TOPONYM}, 4508},
+    {"academia", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"ribeiro", 1, {DICTIONARY_SYNONYM}, -1},
+    {"diacona", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"entre /", 1, {DICTIONARY_CROSS_STREET}, 4241},
     {"associacao", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"cambio", 1, {DICTIONARY_PLACE_NAME}, 4370},
+    {"organizacao nao governamental", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
     {"estação de tratamento de águas residuais", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"fundação pública", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"ver", 1, {DICTIONARY_PERSONAL_TITLE}, 4358},
+    {"amapa", 1, {DICTIONARY_TOPONYM}, 4496},
+    {"acesso", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"pernambuco", 1, {DICTIONARY_TOPONYM}, -1},
     {"bombeiros voluntários", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"at", 1, {DICTIONARY_LEVEL_STANDALONE}, 4252},
-    {"t.te c.el", 1, {DICTIONARY_PERSONAL_TITLE}, 4356},
-    {"p.to", 1, {DICTIONARY_PLACE_NAME}, 4402},
-    {"st.º", 1, {DICTIONARY_PERSONAL_TITLE}, 4342},
-    {"amapa", 1, {DICTIONARY_TOPONYM}, 4494},
-    {"ave", 1, {DICTIONARY_STREET_TYPE}, 4430},
-    {"mus", 1, {DICTIONARY_PLACE_NAME}, 4396},
-    {"nas", 1, {DICTIONARY_STOPWORD}, -1},
-    {"para", 1, {DICTIONARY_STOPWORD}, -1},
+    {"novembro", 1, {DICTIONARY_SYNONYM}, -1},
+    {"mto", 1, {DICTIONARY_PERSONAL_TITLE}, 4317},
+    {"s.f", 1, {DICTIONARY_COMPANY_TYPE}, 4231},
+    {"brº", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4369},
+    {"na", 1, {DICTIONARY_STOPWORD}, 4427},
+    {"s.a.r.l", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
+    {"vd", 1, {DICTIONARY_STREET_TYPE}, 4469},
+    {"superquadra", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"imª", 1, {DICTIONARY_PERSONAL_TITLE}, 4313},
     {"e /", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"na esq de", 1, {DICTIONARY_CROSS_STREET}, 4237},
-    {"al", 1, {DICTIONARY_TOPONYM}, 4493},
-    {"janr.o", 1, {DICTIONARY_SYNONYM}, 4477},
-    {"r.a", 1, {DICTIONARY_SYNONYM}, 4488},
+    {"tras", 1, {DICTIONARY_UNIT_DIRECTION}, 4521},
+    {"bro", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4369},
+    {"imº", 1, {DICTIONARY_PERSONAL_TITLE}, 4314},
     {"sem número", 1, {DICTIONARY_NO_NUMBER}, -1},
     {"torre", 1, {DICTIONARY_BUILDING_TYPE}, -1},
-    {"enf.º", 1, {DICTIONARY_PERSONAL_TITLE}, 4299},
-    {"s f", 1, {DICTIONARY_COMPANY_TYPE}, 4229},
-    {"pará", 1, {DICTIONARY_TOPONYM}, -1},
-    {"patio", 1, {DICTIONARY_SYNONYM}, 4487},
-    {"sto", 1, {DICTIONARY_PERSONAL_TITLE}, 4342},
-    {"janro", 1, {DICTIONARY_SYNONYM}, 4477},
-    {"advogado", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"ong", 1, {DICTIONARY_COMPANY_TYPE}, 4220},
-    {"ep", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
-    {"ip", 1, {DICTIONARY_STREET_TYPE}, 4446},
-    {"fr", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_STREET_TYPE}, 4305},
-    {"dez", 1, {DICTIONARY_SYNONYM}, 4473},
+    {"drª", 1, {DICTIONARY_PERSONAL_TITLE}, 4294},
+    {"casa", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"rondonia", 1, {DICTIONARY_TOPONYM}, 4515},
+    {"númr", 1, {DICTIONARY_NUMBER}, 4262},
+    {"eireli", 1, {DICTIONARY_COMPANY_TYPE}, 4216},
     {"bahia", 1, {DICTIONARY_TOPONYM}, -1},
-    {"mg", 1, {DICTIONARY_TOPONYM}, 4504},
-    {"o", 1, {DICTIONARY_DIRECTIONAL}, 4244},
+    {"drt", 1, {DICTIONARY_UNIT_DIRECTION}, 4439},
+    {"ate", 1, {DICTIONARY_STOPWORD}, 4423},
     {"lojas", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"snc", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
-    {"mqsa", 1, {DICTIONARY_PERSONAL_TITLE}, 4320},
-    {"résdochão", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"ribro", 1, {DICTIONARY_SYNONYM}, 4489},
-    {"junho", 1, {DICTIONARY_SYNONYM}, -1},
+    {"s c p", 1, {DICTIONARY_COMPANY_TYPE}, 4229},
+    {"letra", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"p.j.", 1, {DICTIONARY_PLACE_NAME}, 4402},
+    {"n.a", 1, {DICTIONARY_STOPWORD}, 4427},
     {"condominio", 1, {DICTIONARY_BUILDING_TYPE}, -1},
-    {"pref", 1, {DICTIONARY_PERSONAL_TITLE}, 4331},
+    {"sa", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
+    {"pres", 1, {DICTIONARY_PERSONAL_TITLE}, 4334},
+    {"pda", 1, {DICTIONARY_STREET_TYPE}, 4451},
     {"engenheira", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"são", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"s.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4234},
     {"aos", 1, {DICTIONARY_STOPWORD}, -1},
-    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4291},
-    {"a.t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4252},
-    {"s.a.d.", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
+    {"riba", 1, {DICTIONARY_SYNONYM}, 4490},
+    {"esc", 1, {DICTIONARY_STAIRCASE}, 4421},
+    {"brig", 1, {DICTIONARY_PERSONAL_TITLE}, 4271},
     {"atrás", 1, {DICTIONARY_STOPWORD}, -1},
-    {"b", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"calçadinha", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"aptdo", 1, {DICTIONARY_POST_OFFICE}, 4410},
     {"diacono", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"enf.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4298},
-    {"cor", 1, {DICTIONARY_PERSONAL_TITLE}, 4282},
+    {"eng.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4302},
+    {"pavimento terreo", 1, {DICTIONARY_LEVEL_STANDALONE}, 4257},
     {"praça", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"res do chao", 1, {DICTIONARY_LEVEL_STANDALONE}, 4254},
-    {"sf", 1, {DICTIONARY_COMPANY_TYPE}, 4229},
-    {"os", 1, {DICTIONARY_STOPWORD}, -1},
+    {"scv", 1, {DICTIONARY_LEVEL_SUB_BASEMENT}, 4259},
+    {"parana", 1, {DICTIONARY_TOPONYM}, 4509},
+    {"núm", 1, {DICTIONARY_NUMBER}, 4262},
     {"d", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"s.rs", 1, {DICTIONARY_PERSONAL_TITLE}, 4352},
     {"sociedade anónima desportiva", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"profº", 1, {DICTIONARY_PERSONAL_TITLE}, 4333},
+    {"dezembro", 1, {DICTIONARY_SYNONYM}, -1},
     {"dos", 1, {DICTIONARY_STOPWORD}, -1},
-    {"rua", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"cmdt", 1, {DICTIONARY_PERSONAL_TITLE}, 4279},
     {"cardeal", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"pllc", 1, {DICTIONARY_COMPANY_TYPE}, 4235},
     {"jardim", 1, {DICTIONARY_SYNONYM}, -1},
     {"dona", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"s n c", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
+    {"parcela", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"rod", 1, {DICTIONARY_STREET_TYPE}, 4460},
+    {"pte", 1, {DICTIONARY_PLACE_NAME}, 4403},
+    {"p l l c", 1, {DICTIONARY_COMPANY_TYPE}, 4235},
+    {"nmr.º", 1, {DICTIONARY_NUMBER}, 4262},
     {"nossa senhora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sarg aj.te", 1, {DICTIONARY_PERSONAL_TITLE}, 4345},
-    {"n.o.", 1, {DICTIONARY_DIRECTIONAL}, 4243},
-    {"stª", 1, {DICTIONARY_PERSONAL_TITLE}, 4341},
+    {"r-d-c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"rc", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"escola básica", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"entrada", 1, {DICTIONARY_ENTRANCE}, -1},
-    {"amapá", 1, {DICTIONARY_TOPONYM}, -1},
-    {"cap m g", 1, {DICTIONARY_PERSONAL_TITLE}, 4274},
-    {"ilmo", 1, {DICTIONARY_PERSONAL_TITLE}, 4309},
+    {"s.e.", 1, {DICTIONARY_DIRECTIONAL}, 4247},
+    {"ilmº", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
+    {"sobre", 1, {DICTIONARY_STOPWORD}, -1},
     {"loja", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"policia judiciaria", 1, {DICTIONARY_PLACE_NAME}, 4400},
-    {"govdor", 1, {DICTIONARY_PERSONAL_TITLE}, 4307},
-    {"a.d.", 1, {DICTIONARY_COMPANY_TYPE}, 4207},
-    {"s.n", 1, {DICTIONARY_NO_NUMBER}, 4259},
-    {"d.ra", 1, {DICTIONARY_PERSONAL_TITLE}, 4292},
-    {"direito", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT_DIRECTION}, -1},
-    {"univ", 1, {DICTIONARY_PLACE_NAME}, 4407},
-    {"esq", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT_DIRECTION}, 4438},
-    {"e p", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
+    {"pi", 1, {DICTIONARY_TOPONYM}, 4511},
+    {"s.c.s", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
+    {"eng", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
+    {"cc", 1, {DICTIONARY_PLACE_NAME}, 4375},
+    {"jrd", 1, {DICTIONARY_SYNONYM}, 4480},
+    {"p.s.p.", 1, {DICTIONARY_PLACE_NAME}, 4401},
+    {"s.c.", 1, {DICTIONARY_COMPANY_TYPE}, 4236},
+    {"em.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4299},
     {"unipessoal lda", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"santo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"profª", 1, {DICTIONARY_PERSONAL_TITLE}, 4334},
+    {"ceb", 1, {DICTIONARY_PLACE_NAME}, 4376},
     {"rotunda", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"as", 1, {DICTIONARY_STOPWORD}, 4422},
     {"casal", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"pr", 1, {DICTIONARY_PERSONAL_TITLE}, 4330},
     {"em frente de", 1, {DICTIONARY_STOPWORD}, -1},
+    {"codigo postal", 1, {DICTIONARY_POSTAL_CODE}, 4413},
+    {"d.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4292},
     {"professoras", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"ret", 1, {DICTIONARY_STREET_TYPE}, 4457},
+    {"cdessa", 1, {DICTIONARY_PERSONAL_TITLE}, 4282},
     {"prefeito", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"parada", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"apto", 1, {DICTIONARY_UNIT_NUMBERED}, 4520},
-    {"me", 1, {DICTIONARY_PERSONAL_TITLE}, 4321},
+    {"ap", 1, {DICTIONARY_TOPONYM}, 4496},
+    {"com.or", 1, {DICTIONARY_PERSONAL_TITLE}, 4280},
     {"esquina", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"exª", 1, {DICTIONARY_PERSONAL_TITLE}, 4302},
-    {"ribeira", 1, {DICTIONARY_SYNONYM}, -1},
-    {"cxp", 1, {DICTIONARY_POST_OFFICE}, 4409},
+    {"st", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
+    {"firma individual", 1, {DICTIONARY_COMPANY_TYPE}, 4215},
+    {"enfª", 1, {DICTIONARY_PERSONAL_TITLE}, 4300},
+    {"secr", 1, {DICTIONARY_PERSONAL_TITLE}, 4349},
     {"praia", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"residencia", 1, {DICTIONARY_BUILDING_TYPE}, -1},
-    {"cia", 1, {DICTIONARY_COMPANY_TYPE}, 4210},
-    {"arq", 1, {DICTIONARY_PLACE_NAME}, 4366},
-    {"batalhao", 1, {DICTIONARY_SYNONYM}, -1},
-    {"riba", 1, {DICTIONARY_SYNONYM}, 4488},
-    {"liberd.e", 1, {DICTIONARY_SYNONYM}, 4484},
-    {"imª", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
-    {"rev.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4340},
-    {"marqa", 1, {DICTIONARY_PERSONAL_TITLE}, 4320},
-    {"v.de", 1, {DICTIONARY_PERSONAL_TITLE}, 4361},
-    {"bro", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4367},
-    {"tte cel", 1, {DICTIONARY_PERSONAL_TITLE}, 4356},
-    {"loteamento", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"r.c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"aeroporto", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"f.c", 1, {DICTIONARY_COMPANY_TYPE}, 4220},
+    {"tv", 1, {DICTIONARY_STREET_TYPE}, 4466},
+    {"ip", 1, {DICTIONARY_STREET_TYPE}, 4448},
+    {"madre", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"cd", 1, {DICTIONARY_COMPANY_TYPE}, 4211},
     {"sargento", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"e.i.r.e.l.i.", 1, {DICTIONARY_COMPANY_TYPE}, 4214},
-    {"viscondesa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"exmº", 1, {DICTIONARY_PERSONAL_TITLE}, 4304},
+    {"s c s", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
+    {"r/r / chão", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"ace", 1, {DICTIONARY_COMPANY_TYPE}, 4208},
+    {"resdochao", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
     {"edifício", 1, {DICTIONARY_BUILDING_TYPE}, -1},
-    {"sociedade anonima", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
-    {"ft", 1, {DICTIONARY_STREET_TYPE}, 4444},
-    {"o n g", 1, {DICTIONARY_COMPANY_TYPE}, 4220},
+    {"enf.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
+    {"em", 1, {DICTIONARY_STREET_TYPE}, 4443},
+    {"al", 1, {DICTIONARY_TOPONYM}, 4495},
+    {"jun", 1, {DICTIONARY_SYNONYM}, 4481},
     {"banco", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"se", 1, {DICTIONARY_DIRECTIONAL}, 4245},
-    {"pavilhão", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"q", 1, {DICTIONARY_QUALIFIER}, 4414},
-    {"major", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"10br.o", 1, {DICTIONARY_SYNONYM}, 4475},
+    {"museu", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"n.s.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
+    {"s.nº", 1, {DICTIONARY_NO_NUMBER}, 4261},
     {"caixa postal", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"e t a r", 1, {DICTIONARY_PLACE_NAME}, 4381},
-    {"ra", 1, {DICTIONARY_SYNONYM}, 4488},
-    {"pto", 1, {DICTIONARY_STREET_TYPE}, 4451},
-    {"praceta", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pj", 1, {DICTIONARY_PLACE_NAME}, 4400},
-    {"julho", 1, {DICTIONARY_SYNONYM}, -1},
+    {"vde", 1, {DICTIONARY_PERSONAL_TITLE}, 4363},
+    {"crl", 1, {DICTIONARY_COMPANY_TYPE}, 4214},
+    {"f.c.", 1, {DICTIONARY_COMPANY_TYPE}, 4220},
+    {"r c", 1, {DICTIONARY_LEVEL_STANDALONE}, 4256},
+    {"qu", 1, {DICTIONARY_STREET_TYPE}, 4458},
     {"agência bancária", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"senhora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"dep", 1, {DICTIONARY_PERSONAL_TITLE}, 4284},
+    {"zn", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4420},
     {"nível", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"s c s", 1, {DICTIONARY_COMPANY_TYPE}, 4228},
-    {"r part", 1, {DICTIONARY_STREET_TYPE}, 4461},
-    {"terminal rodoviário", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"mstro", 1, {DICTIONARY_PERSONAL_TITLE}, 4315},
-    {"estacao de onibus", 1, {DICTIONARY_PLACE_NAME}, 4386},
-    {"lt.da", 1, {DICTIONARY_COMPANY_TYPE}, 4219},
-    {"al", 1, {DICTIONARY_STREET_TYPE}, 4428},
-    {"bº", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4367},
-    {"vv", 1, {DICTIONARY_BUILDING_TYPE}, 4205},
-    {"il.mº", 1, {DICTIONARY_PERSONAL_TITLE}, 4309},
-    {"escnh", 1, {DICTIONARY_PLACE_NAME}, 4378},
-    {"ago", 1, {DICTIONARY_SYNONYM}, 4472},
-    {"p.j", 1, {DICTIONARY_PLACE_NAME}, 4400},
-    {"sub cv", 1, {DICTIONARY_LEVEL_SUB_BASEMENT}, 4257},
-    {"psp", 1, {DICTIONARY_PLACE_NAME}, 4399},
-    {"itinerário principal", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"piauí", 1, {DICTIONARY_TOPONYM}, -1},
-    {"capitão de fragata", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"pe", 1, {DICTIONARY_PERSONAL_TITLE}, 4331},
+    {"nsa", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
+    {"sta", 1, {DICTIONARY_PERSONAL_TITLE}, 4343},
+    {"lxa", 1, {DICTIONARY_TOPONYM}, 4493},
+    {"direito", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT_DIRECTION}, -1},
+    {"estacao de onibus", 1, {DICTIONARY_PLACE_NAME}, 4388},
+    {"junho", 1, {DICTIONARY_SYNONYM}, -1},
+    {"ccnh", 1, {DICTIONARY_STREET_TYPE}, 4437},
+    {"acre", 1, {DICTIONARY_TOPONYM}, -1},
     {"divisao", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"coronel", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"revmo", 1, {DICTIONARY_PERSONAL_TITLE}, 4340},
-    {"langa mine", 1, {DICTIONARY_NEAR}, 4537},
+    {"fc", 1, {DICTIONARY_COMPANY_TYPE}, 4220},
+    {"engo", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
+    {"sociedade anonima de responsabilidade limitada", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
+    {"sgto", 1, {DICTIONARY_PERSONAL_TITLE}, 4346},
+    {"reverendissima", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"sras", 1, {DICTIONARY_PERSONAL_TITLE}, 4354},
+    {"p.te", 1, {DICTIONARY_PLACE_NAME}, 4403},
+    {"ava marg", 1, {DICTIONARY_STREET_TYPE}, 4433},
+    {"itinerário principal", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"bº", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4369},
+    {"d.rª", 1, {DICTIONARY_PERSONAL_TITLE}, 4294},
+    {"c p", 1, {DICTIONARY_POSTAL_CODE}, 4413},
+    {"c.e.b", 1, {DICTIONARY_PLACE_NAME}, 4376},
+    {"conde", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"terminal rodoviario", 1, {DICTIONARY_PLACE_NAME}, 4407},
+    {"cp", 1, {DICTIONARY_POSTAL_CODE}, 4413},
+    {"numar", 1, {DICTIONARY_NUMBER}, 4541},
     {"lotul", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"sp", 1, {DICTIONARY_STREET_TYPE}, 4561},
     {"căsuță poștală", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"intr", 1, {DICTIONARY_STREET_TYPE}, 4554},
-    {"no", 1, {DICTIONARY_NUMBER}, 4539},
-    {"piata", 1, {DICTIONARY_STREET_TYPE}, 4555},
-    {"bul", 1, {DICTIONARY_STREET_TYPE}, 4550},
-    {"etj", 1, {DICTIONARY_LEVEL_NUMBERED}, 4534},
-    {"et", 1, {DICTIONARY_LEVEL_NUMBERED}, 4534},
-    {"f n", 1, {DICTIONARY_NO_NUMBER}, 4538},
+    {"fdc", 1, {DICTIONARY_STREET_TYPE}, 4555},
+    {"cal", 1, {DICTIONARY_STREET_TYPE}, 4553},
+    {"vf", 1, {DICTIONARY_STREET_TYPE}, 4562},
+    {"ale", 1, {DICTIONARY_STREET_TYPE}, 4551},
+    {"bd", 1, {DICTIONARY_STREET_TYPE}, 4552},
     {"sală", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"varf", 1, {DICTIONARY_STREET_TYPE}, 4560},
-    {"casuta postala", 1, {DICTIONARY_POST_OFFICE}, 4546},
+    {"int", 1, {DICTIONARY_STREET_TYPE}, 4556},
+    {"capt", 1, {DICTIONARY_PERSONAL_TITLE}, 4542},
     {"aici", 1, {DICTIONARY_NEAR}, -1},
-    {"blv", 1, {DICTIONARY_STREET_TYPE}, 4550},
-    {"sala", 1, {DICTIONARY_UNIT_NUMBERED}, 4562},
-    {"bulevard", 1, {DICTIONARY_STREET_TYPE}, 4550},
-    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4532},
-    {"colț", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4561},
+    {"apart", 1, {DICTIONARY_UNIT_NUMBERED}, 4563},
+    {"bulev", 1, {DICTIONARY_STREET_TYPE}, 4552},
+    {"piață", 1, {DICTIONARY_STREET_TYPE}, 4557},
     {"strada", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"vest", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"în jurul aici", 1, {DICTIONARY_NEAR}, -1},
-    {"si", 1, {DICTIONARY_CROSS_STREET}, 4529},
-    {"fara numar", 1, {DICTIONARY_NO_NUMBER}, 4538},
-    {"cp", 1, {DICTIONARY_POST_OFFICE}, 4546},
-    {"fundatura", 1, {DICTIONARY_STREET_TYPE}, 4552},
+    {"varf", 1, {DICTIONARY_STREET_TYPE}, 4562},
+    {"est", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"capitan", 1, {DICTIONARY_PERSONAL_TITLE}, 4542},
+    {"fn", 1, {DICTIONARY_NO_NUMBER}, 4540},
+    {"intr", 1, {DICTIONARY_STREET_TYPE}, 4556},
+    {"no", 1, {DICTIONARY_NUMBER}, 4541},
+    {"f / n", 1, {DICTIONARY_NO_NUMBER}, 4540},
+    {"alea", 1, {DICTIONARY_STREET_TYPE}, 4551},
     {"scara", 1, {DICTIONARY_STAIRCASE}, -1},
-    {"b.dul", 1, {DICTIONARY_STREET_TYPE}, 4550},
-    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4561},
-    {"intrarea", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"&", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"prof", 1, {DICTIONARY_PERSONAL_TITLE}, 4545},
-    {"p-ta", 1, {DICTIONARY_STREET_TYPE}, 4555},
+    {"in apropiere", 1, {DICTIONARY_NEAR}, 4537},
+    {"nr", 1, {DICTIONARY_NUMBER}, 4541},
+    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4545},
+    {"nº", 1, {DICTIONARY_NUMBER}, 4541},
+    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4544},
     {"locotenent colonel", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"căpitan", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"număr", 1, {DICTIONARY_NUMBER}, -1},
-    {"str", 1, {DICTIONARY_STREET_TYPE}, 4556},
-    {"soseaua", 1, {DICTIONARY_STREET_TYPE}, 4558},
-    {"la coltul de pe", 1, {DICTIONARY_CROSS_STREET}, 4528},
+    {"bulevard", 1, {DICTIONARY_STREET_TYPE}, 4552},
     {"parter", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"colt", 1, {DICTIONARY_CROSS_STREET}, 4526},
-    {"n", 1, {DICTIONARY_DIRECTIONAL}, 4531},
+    {"și", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"maj", 1, {DICTIONARY_PERSONAL_TITLE}, 4546},
+    {"bl", 1, {DICTIONARY_QUALIFIER}, 4549},
     {"aleea", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"sdla", 1, {DICTIONARY_STREET_TYPE}, 4557},
-    {"str-la", 1, {DICTIONARY_STREET_TYPE}, 4557},
-    {"fn", 1, {DICTIONARY_NO_NUMBER}, 4538},
+    {"intrarea", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"locotenent", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sos", 1, {DICTIONARY_STREET_TYPE}, 4558},
-    {"al", 1, {DICTIONARY_STREET_TYPE}, 4549},
-    {"virful", 1, {DICTIONARY_STREET_TYPE}, 4560},
-    {"in jurul aici", 1, {DICTIONARY_NEAR}, 4536},
+    {"col", 1, {DICTIONARY_PERSONAL_TITLE}, 4543},
+    {"&", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"p-ta", 1, {DICTIONARY_STREET_TYPE}, 4557},
+    {"stradela", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"șoseaua", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"spl", 1, {DICTIONARY_STREET_TYPE}, 4559},
     {"e", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"pţa", 1, {DICTIONARY_STREET_TYPE}, 4555},
+    {"varful", 1, {DICTIONARY_STREET_TYPE}, 4562},
     {"vârful", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"#", 1, {DICTIONARY_NUMBER}, 4541},
+    {"blvd", 1, {DICTIONARY_STREET_TYPE}, 4552},
+    {"blv", 1, {DICTIONARY_STREET_TYPE}, 4552},
     {"general", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4543},
-    {"sp", 1, {DICTIONARY_STREET_TYPE}, 4559},
+    {"pta", 1, {DICTIONARY_STREET_TYPE}, 4557},
+    {"bulevardu", 1, {DICTIONARY_STREET_TYPE}, 4552},
+    {"fnd", 1, {DICTIONARY_STREET_TYPE}, 4554},
     {"lângă mine", 1, {DICTIONARY_NEAR}, -1},
-    {"nord", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"ale", 1, {DICTIONARY_STREET_TYPE}, 4549},
+    {"bdul", 1, {DICTIONARY_STREET_TYPE}, 4552},
+    {"sc", 1, {DICTIONARY_STAIRCASE}, 4550},
     {"n", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"№", 1, {DICTIONARY_NUMBER}, 4541},
     {"bloc", 1, {DICTIONARY_QUALIFIER}, -1},
     {"doctor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"amiral", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"bulevardu", 1, {DICTIONARY_STREET_TYPE}, 4550},
-    {"capt", 1, {DICTIONARY_PERSONAL_TITLE}, 4540},
+    {"b-dul", 1, {DICTIONARY_STREET_TYPE}, 4552},
     {"sergent", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"p-ţa", 1, {DICTIONARY_STREET_TYPE}, 4555},
-    {"bdul", 1, {DICTIONARY_STREET_TYPE}, 4550},
+    {"b.dul", 1, {DICTIONARY_STREET_TYPE}, 4552},
+    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4534},
     {"calea", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"la colțul de pe", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4563},
+    {"si", 1, {DICTIONARY_CROSS_STREET}, 4531},
     {"bulevardul", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pta", 1, {DICTIONARY_STREET_TYPE}, 4555},
+    {"piata", 1, {DICTIONARY_STREET_TYPE}, 4557},
     {"sublocotenent", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"fundatura", 1, {DICTIONARY_STREET_TYPE}, 4554},
+    {"spl", 1, {DICTIONARY_STREET_TYPE}, 4561},
     {"fundătura", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4535},
     {"profesor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"colonel", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"blvd", 1, {DICTIONARY_STREET_TYPE}, 4550},
+    {"langa mine", 1, {DICTIONARY_NEAR}, 4539},
+    {"prof", 1, {DICTIONARY_PERSONAL_TITLE}, 4547},
     {"fără număr", 1, {DICTIONARY_NO_NUMBER}, -1},
-    {"vîrful", 1, {DICTIONARY_STREET_TYPE}, 4560},
-    {"birou", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"fdc", 1, {DICTIONARY_STREET_TYPE}, 4553},
-    {"și", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"șos", 1, {DICTIONARY_STREET_TYPE}, 4558},
+    {"intre", 1, {DICTIONARY_CROSS_STREET}, 4529},
+    {"șos", 1, {DICTIONARY_STREET_TYPE}, 4560},
+    {"nord", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"str", 1, {DICTIONARY_STREET_TYPE}, 4558},
+    {"soseaua", 1, {DICTIONARY_STREET_TYPE}, 4560},
+    {"etj", 1, {DICTIONARY_LEVEL_NUMBERED}, 4536},
     {"s", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"f n", 1, {DICTIONARY_NO_NUMBER}, 4540},
     {"în apropiere", 1, {DICTIONARY_NEAR}, -1},
-    {"maj", 1, {DICTIONARY_PERSONAL_TITLE}, 4544},
+    {"colț", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"contra amiral", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"bl", 1, {DICTIONARY_QUALIFIER}, 4547},
+    {"în jurul aici", 1, {DICTIONARY_NEAR}, -1},
     {"cel", 1, {DICTIONARY_STOPWORD}, -1},
+    {"str-la", 1, {DICTIONARY_STREET_TYPE}, 4559},
     {"apartament", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"din", 1, {DICTIONARY_NEAR}, -1},
-    {"vf", 1, {DICTIONARY_STREET_TYPE}, 4560},
     {"drumul", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"stradela", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"sos", 1, {DICTIONARY_STREET_TYPE}, 4560},
+    {"al", 1, {DICTIONARY_STREET_TYPE}, 4551},
     {"comandor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sud", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"bulev", 1, {DICTIONARY_STREET_TYPE}, 4550},
-    {"e", 1, {DICTIONARY_DIRECTIONAL}, 4530},
-    {"capitan", 1, {DICTIONARY_PERSONAL_TITLE}, 4540},
-    {"intre", 1, {DICTIONARY_CROSS_STREET}, 4527},
-    {"int", 1, {DICTIONARY_STREET_TYPE}, 4554},
+    {"virful", 1, {DICTIONARY_STREET_TYPE}, 4562},
+    {"n", 1, {DICTIONARY_DIRECTIONAL}, 4533},
+    {"colt", 1, {DICTIONARY_CROSS_STREET}, 4528},
+    {"fara numar", 1, {DICTIONARY_NO_NUMBER}, 4540},
+    {"birou", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"cp", 1, {DICTIONARY_POST_OFFICE}, 4548},
     {"intrare", 1, {DICTIONARY_ENTRANCE}, -1},
-    {"f / n", 1, {DICTIONARY_NO_NUMBER}, 4538},
-    {"alea", 1, {DICTIONARY_STREET_TYPE}, 4549},
-    {"in apropiere", 1, {DICTIONARY_NEAR}, 4535},
+    {"f.n", 1, {DICTIONARY_NO_NUMBER}, 4540},
     {"v", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"nr", 1, {DICTIONARY_NUMBER}, 4539},
     {"vice amiral", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"nº", 1, {DICTIONARY_NUMBER}, 4539},
-    {"numar", 1, {DICTIONARY_NUMBER}, 4539},
-    {"sc", 1, {DICTIONARY_STAIRCASE}, 4548},
-    {"piață", 1, {DICTIONARY_STREET_TYPE}, 4555},
+    {"pţa", 1, {DICTIONARY_STREET_TYPE}, 4557},
     {"piaţa", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"fundacul", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"cal", 1, {DICTIONARY_STREET_TYPE}, 4551},
     {"splaiul", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"fnd", 1, {DICTIONARY_STREET_TYPE}, 4552},
-    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4542},
+    {"la coltul de pe", 1, {DICTIONARY_CROSS_STREET}, 4530},
+    {"et", 1, {DICTIONARY_LEVEL_NUMBERED}, 4536},
     {"major", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"in apropiere de", 1, {DICTIONARY_NEAR}, -1},
-    {"apart", 1, {DICTIONARY_UNIT_NUMBERED}, 4561},
-    {"est", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"sud", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"p-ţa", 1, {DICTIONARY_STREET_TYPE}, 4557},
+    {"sdla", 1, {DICTIONARY_STREET_TYPE}, 4559},
+    {"e", 1, {DICTIONARY_DIRECTIONAL}, 4532},
     {"aproape de aici", 1, {DICTIONARY_NEAR}, -1},
-    {"col", 1, {DICTIONARY_PERSONAL_TITLE}, 4541},
+    {"casuta postala", 1, {DICTIONARY_POST_OFFICE}, 4548},
+    {"vîrful", 1, {DICTIONARY_STREET_TYPE}, 4562},
+    {"sala", 1, {DICTIONARY_UNIT_NUMBERED}, 4564},
     {"între", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"f.n", 1, {DICTIONARY_NO_NUMBER}, 4538},
-    {"bd", 1, {DICTIONARY_STREET_TYPE}, 4550},
-    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4533},
+    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4563},
+    {"in jurul aici", 1, {DICTIONARY_NEAR}, 4538},
+    {"bul", 1, {DICTIONARY_STREET_TYPE}, 4552},
     {"etaj", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"№", 1, {DICTIONARY_NUMBER}, 4539},
-    {"varful", 1, {DICTIONARY_STREET_TYPE}, 4560},
-    {"#", 1, {DICTIONARY_NUMBER}, 4539},
-    {"b-dul", 1, {DICTIONARY_STREET_TYPE}, 4550},
-    {"alfabank", 1, {DICTIONARY_CHAIN}, 4566},
-    {"k", 1, {DICTIONARY_UNIT_NUMBERED}, 4700},
+    {"просп", 1, {DICTIONARY_STREET_TYPE}, 4698},
+    {"д", 1, {DICTIONARY_QUALIFIER}, 4661},
     {"lukoil", 1, {DICTIONARY_CHAIN}, -1},
+    {"горныи приют", 1, {DICTIONARY_PLACE_NAME}, 4654},
     {"pereulok", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"хозяйственный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"pom", 1, {DICTIONARY_UNIT_NUMBERED}, 4706},
+    {"газетныи киоск", 1, {DICTIONARY_PLACE_NAME}, 4647},
+    {"обл", 1, {DICTIONARY_QUALIFIER}, 4667},
+    {"юго востоку", 1, {DICTIONARY_DIRECTIONAL}, 4589},
     {"подвал", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
     {"торговый центр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"помещение", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"no", 1, {DICTIONARY_NUMBER}, 4610},
     {"tupik", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ooo", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"ковры", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4586},
     {"магазин по продаже мотоциклов", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"развалины", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"музей", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"bul", 1, {DICTIONARY_STREET_TYPE}, 4687},
+    {"ул", 1, {DICTIONARY_STREET_TYPE}, 4706},
+    {"vozle", 1, {DICTIONARY_NEAR}, -1},
+    {"d", 1, {DICTIONARY_QUALIFIER}, 4662},
     {"памятник", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"раион", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"караван-сараи", 1, {DICTIONARY_PLACE_NAME}, 4652},
-    {"просп", 1, {DICTIONARY_STREET_TYPE}, 4687},
-    {"место уличнои торговли", 1, {DICTIONARY_PLACE_NAME}, 4645},
-    {"книжныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4627},
+    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4707},
     {"россельхозбанк", 1, {DICTIONARY_CHAIN}, -1},
+    {"к", 1, {DICTIONARY_BUILDING_TYPE}, 4565},
     {"деревня", 1, {DICTIONARY_QUALIFIER}, -1},
     {"магазин оптики", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"pomeshhenie", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"юго западу", 1, {DICTIONARY_DIRECTIONAL}, 4589},
-    {"сделаи-сам", 1, {DICTIONARY_PLACE_NAME}, 4632},
+    {"posolok gorodskogo tipa", 1, {DICTIONARY_QUALIFIER}, 4683},
     {"shosseynaya", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"поселок городского типа", 1, {DICTIONARY_QUALIFIER}, 4682},
     {"maria-ra", 1, {DICTIONARY_CHAIN}, -1},
     {"tsokol'nyy etazh", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
     {"шоссейная", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"вблизи", 1, {DICTIONARY_NEAR}, -1},
-    {"г", 1, {DICTIONARY_QUALIFIER}, 4667},
-    {"ofis", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"художественныи салон", 1, {DICTIONARY_PLACE_NAME}, 4629},
+    {"место захоронения", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"g", 1, {DICTIONARY_QUALIFIER}, 4673},
     {"sever", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"lin", 1, {DICTIONARY_STREET_TYPE}, 4690},
-    {"k", 1, {DICTIONARY_BUILDING_TYPE}, 4564},
+    {"цветочныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4639},
     {"винный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"monetka", 1, {DICTIONARY_CHAIN}, -1},
-    {"киоск", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"lin", 1, {DICTIONARY_STREET_TYPE}, 4701},
+    {"юго-востоку", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"право", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"обувнои магазин", 1, {DICTIONARY_PLACE_NAME}, 4646},
+    {"k", 1, {DICTIONARY_UNIT_NUMBERED}, 4711},
+    {"пом", 1, {DICTIONARY_UNIT_NUMBERED}, 4716},
     {"эльдорадо", 1, {DICTIONARY_CHAIN}, -1},
     {"sberbank", 1, {DICTIONARY_CHAIN}, -1},
-    {"z", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"магазин бытовои химии", 1, {DICTIONARY_PLACE_NAME}, 4629},
-    {"pos", 1, {DICTIONARY_QUALIFIER}, 4672},
+    {"azs", 1, {DICTIONARY_CHAIN}, -1},
     {"около", 1, {DICTIONARY_NEAR}, -1},
-    {"о", 1, {DICTIONARY_QUALIFIER}, 4665},
     {"пляж с насаждениями", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"литера", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"под", 1, {DICTIONARY_NEAR}, -1},
-    {"of", 1, {DICTIONARY_UNIT_NUMBERED}, 4704},
     {"автомагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"с / с", 1, {DICTIONARY_QUALIFIER}, 4678},
+    {"автомоика", 1, {DICTIONARY_PLACE_NAME}, 4617},
     {"фермерский магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"обл", 1, {DICTIONARY_QUALIFIER}, 4662},
-    {"сделаи сам", 1, {DICTIONARY_PLACE_NAME}, 4632},
-    {"в", 1, {DICTIONARY_DIRECTIONAL}, 4583},
+    {"gazprom-neft", 1, {DICTIONARY_CHAIN}, 4571},
+    {"obl", 1, {DICTIONARY_QUALIFIER}, 4668},
+    {"nab", 1, {DICTIONARY_STREET_TYPE}, 4692},
     {"dns shop", 1, {DICTIONARY_CHAIN}, -1},
-    {"пер", 1, {DICTIONARY_STREET_TYPE}, 4682},
     {"ростелеком", 1, {DICTIONARY_CHAIN}, -1},
     {"овощной магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"гп", 1, {DICTIONARY_QUALIFIER}, 4674},
     {"монетка", 1, {DICTIONARY_CHAIN}, -1},
+    {"posolok gorodskógo típa", 1, {DICTIONARY_QUALIFIER}, -1},
     {"углу", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"север", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"салон", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"фермерскии магазин", 1, {DICTIONARY_PLACE_NAME}, 4633},
+    {"ген", 1, {DICTIONARY_PERSONAL_TITLE}, 4611},
     {"страховая компания", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ларек", 1, {DICTIONARY_PLACE_NAME}, 4631},
     {"gmina", 1, {DICTIONARY_QUALIFIER}, -1},
     {"бордель", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"туристическои агентство", 1, {DICTIONARY_PLACE_NAME}, 4649},
+    {"городской посёлок ", 1, {DICTIONARY_QUALIFIER}, -1},
     {"магазин модной одежды", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"кв", 1, {DICTIONARY_QUALIFIER}, 4660},
-    {"obl", 1, {DICTIONARY_QUALIFIER}, 4663},
+    {"пятерочка", 1, {DICTIONARY_CHAIN}, 4569},
+    {"поле для гольфа", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"k-t", 1, {DICTIONARY_UNIT_NUMBERED}, 4711},
     {"посёлок", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"gp", 1, {DICTIONARY_QUALIFIER}, 4675},
+    {"yugo vostoku", 1, {DICTIONARY_DIRECTIONAL}, 4590},
+    {"посёлок городско́го ти́па", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"pom", 1, {DICTIONARY_UNIT_NUMBERED}, 4717},
+    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4580},
     {"оао", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"posblok", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"хозяиственныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4641},
-    {"lestnitsa", 1, {DICTIONARY_STAIRCASE}, -1},
-    {"северо Запад", 1, {DICTIONARY_DIRECTIONAL}, 4581},
+    {"крематории", 1, {DICTIONARY_PLACE_NAME}, 4619},
+    {"общественныи центр", 1, {DICTIONARY_PLACE_NAME}, 4618},
+    {"кв", 1, {DICTIONARY_QUALIFIER}, 4665},
+    {"ал", 1, {DICTIONARY_STREET_TYPE}, 4684},
     {"вход", 1, {DICTIONARY_ENTRANCE}, -1},
-    {"альфа банк", 1, {DICTIONARY_CHAIN}, 4565},
+    {"раион", 1, {DICTIONARY_QUALIFIER}, -1},
     {"парк", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"гостиница", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"роснефть", 1, {DICTIONARY_CHAIN}, -1},
+    {"ш", 1, {DICTIONARY_STREET_TYPE}, 4702},
     {"колледж", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"магазин бытовой химии", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"проспект", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"секонд хэнд", 1, {DICTIONARY_PLACE_NAME}, 4631},
+    {"з", 1, {DICTIONARY_DIRECTIONAL}, 4593},
     {"банк", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"обувной магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"poselok", 1, {DICTIONARY_QUALIFIER}, -1},
     {"сделай-сам", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"svyaznoy", 1, {DICTIONARY_CHAIN}, -1},
     {"секонд-хэнд", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -81358,155 +81390,153 @@ address_expansion_rule_t expansion_rules[] = {
     {"первый этаж", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"kvartira", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"v", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_NEAR}, -1},
-    {"ниж эт", 1, {DICTIONARY_LEVEL_STANDALONE}, 4602},
+    {"открытое акционерное общество", 1, {DICTIONARY_COMPANY_TYPE}, 4575},
     {"blok", 1, {DICTIONARY_QUALIFIER}, -1},
     {"o", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"kab", 1, {DICTIONARY_UNIT_NUMBERED}, 4700},
+    {"пл", 1, {DICTIONARY_STREET_TYPE}, 4695},
+    {"selskiy sovet", 1, {DICTIONARY_QUALIFIER}, 4679},
     {"yug", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"спортивныи газон", 1, {DICTIONARY_PLACE_NAME}, 4622},
     {"спортивный газон", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"стадион", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"dns", 1, {DICTIONARY_CHAIN}, -1},
-    {"к", 1, {DICTIONARY_UNIT_NUMBERED}, 4699},
     {"магазин экологических продуктов", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"сделай сам", 1, {DICTIONARY_PLACE_NAME}, 4635},
     {"художественный салон", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"общежитие", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"рядом", 1, {DICTIONARY_NEAR}, -1},
     {"i", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"тренажерный зал", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"запад", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"музей", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"кольцевая", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"но", 1, {DICTIONARY_NUMBER}, 4609},
     {"uroven'", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"naberezhnaya", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"agrogorodok", 1, {DICTIONARY_QUALIFIER}, -1},
     {"билайн", 1, {DICTIONARY_CHAIN}, -1},
-    {"vtb24", 1, {DICTIONARY_CHAIN}, -1},
     {"восток", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"проезд", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"№", 1, {DICTIONARY_NUMBER}, 4606},
-    {"kvartal", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"караван сараи", 1, {DICTIONARY_PLACE_NAME}, 4655},
     {"крематорий", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"туристическои агентство", 1, {DICTIONARY_PLACE_NAME}, 4652},
     {"кондитерская", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"караван сарай", 1, {DICTIONARY_PLACE_NAME}, 4655},
+    {"без номера", 1, {DICTIONARY_NO_NUMBER}, -1},
     {"oao", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"ул", 1, {DICTIONARY_STREET_TYPE}, 4695},
     {"okolo", 1, {DICTIONARY_NEAR}, -1},
+    {"nekommercheskaya organizatsiya", 1, {DICTIONARY_COMPANY_TYPE}, 4573},
     {"лево", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"pervyy etazh", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"автомойка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"веломагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"alfa bank", 1, {DICTIONARY_CHAIN}, 4566},
+    {"ryadom zdes", 1, {DICTIONARY_NEAR}, 4606},
+    {"gorodskoy posolok", 1, {DICTIONARY_QUALIFIER}, -1},
     {"магазин электротоваров", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ryadom zdes'", 1, {DICTIONARY_NEAR}, -1},
-    {"к-т", 1, {DICTIONARY_UNIT_NUMBERED}, 4699},
-    {"северо востоку", 1, {DICTIONARY_DIRECTIONAL}, 4579},
+    {"кв", 1, {DICTIONARY_UNIT_NUMBERED}, 4708},
+    {"цок эт", 1, {DICTIONARY_LEVEL_BASEMENT}, 4597},
     {"в", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_NEAR}, -1},
+    {"хозяиственныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4644},
+    {"al", 1, {DICTIONARY_STREET_TYPE}, 4685},
     {"здание больницы", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"газетныи киоск", 1, {DICTIONARY_PLACE_NAME}, 4644},
+    {"сельсовет", 1, {DICTIONARY_QUALIFIER}, -1},
     {"prospekt", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"no", 1, {DICTIONARY_NUMBER}, 4607},
+    {"obshchestvo s ogranichennoy otvetstvennostyu", 1, {DICTIONARY_COMPANY_TYPE}, 4578},
     {"домик для гостей", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"агрогородок", 1, {DICTIONARY_QUALIFIER}, -1},
     {"д", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"derevnya", 1, {DICTIONARY_QUALIFIER}, -1},
     {"библиотека", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"рядом с", 1, {DICTIONARY_NEAR}, -1},
-    {"домик для гостеи", 1, {DICTIONARY_PLACE_NAME}, 4653},
+    {"пр", 1, {DICTIONARY_STREET_TYPE}, 4698},
     {"магазин видеозаписей", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"св", 1, {DICTIONARY_PERSONAL_TITLE}, 4610},
+    {"&", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"bulvar", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"dor", 1, {DICTIONARY_STREET_TYPE}, 4678},
-    {"severo vostoku", 1, {DICTIONARY_DIRECTIONAL}, 4580},
-    {"sh", 1, {DICTIONARY_STREET_TYPE}, 4692},
     {"дорога", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"торговыи центр", 1, {DICTIONARY_PLACE_NAME}, 4647},
-    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4578},
+    {"книжныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4630},
     {"здесь", 1, {DICTIONARY_NEAR}, -1},
     {"shosse", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"пл", 1, {DICTIONARY_STREET_TYPE}, 4684},
+    {"ночнои клуб", 1, {DICTIONARY_PLACE_NAME}, 4623},
+    {"мебельныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4641},
     {"oblast", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"северо Запад", 1, {DICTIONARY_DIRECTIONAL}, 4583},
     {"автомастерская", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"велопарковка", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"nizh et", 1, {DICTIONARY_LEVEL_STANDALONE}, 4605},
+    {"o", 1, {DICTIONARY_QUALIFIER}, 4671},
     {"гмина", 1, {DICTIONARY_QUALIFIER}, -1},
     {"цокольный этаж", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
-    {"perv et", 1, {DICTIONARY_LEVEL_STANDALONE}, 4601},
     {"yugo-zapadu", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"академика", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"dom", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
     {"магазин подарков", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"цветочныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4636},
-    {"пр", 1, {DICTIONARY_STREET_TYPE}, 4686},
+    {"кооператив", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"pomeshhenie", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"ploshchad", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"abonementnykh skrynka", 1, {DICTIONARY_POST_OFFICE}, 4655},
-    {"r-n", 1, {DICTIONARY_QUALIFIER}, 4670},
+    {"обувнои магазин", 1, {DICTIONARY_PLACE_NAME}, 4649},
     {"pyatorochka", 1, {DICTIONARY_CHAIN}, -1},
     {"kol'tsevaya", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"салон красоты", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"zdes", 1, {DICTIONARY_NEAR}, 4607},
+    {"б.н.", 1, {DICTIONARY_NO_NUMBER}, 4608},
     {"посблок", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"ю", 1, {DICTIONARY_DIRECTIONAL}, 4585},
-    {"юго востоку", 1, {DICTIONARY_DIRECTIONAL}, 4587},
-    {"et", 1, {DICTIONARY_LEVEL_NUMBERED}, 4598},
-    {"открытое акционерное общество", 1, {DICTIONARY_COMPANY_TYPE}, 4573},
+    {"бассеин", 1, {DICTIONARY_PLACE_NAME}, 4627},
     {"ювелирный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"горный приют", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"кварт", 1, {DICTIONARY_QUALIFIER}, 4665},
     {"лестница", 1, {DICTIONARY_STAIRCASE}, -1},
     {"podval", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
     {"музыкальный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"этаж", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"rospechat", 1, {DICTIONARY_CHAIN}, -1},
-    {"лит", 1, {DICTIONARY_UNIT_NUMBERED}, 4701},
     {"аквапарк", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ал", 1, {DICTIONARY_STREET_TYPE}, 4673},
-    {"магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"дор", 1, {DICTIONARY_STREET_TYPE}, 4677},
+    {"мебельный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"у", 1, {DICTIONARY_NEAR}, -1},
-    {"детскии сад", 1, {DICTIONARY_PLACE_NAME}, 4619},
+    {"пгт", 1, {DICTIONARY_QUALIFIER}, 4682},
     {"монумент", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"litera", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"ano", 1, {DICTIONARY_COMPANY_TYPE}, 4570},
-    {"otkrytoye aktsionernoye obshchestvo", 1, {DICTIONARY_COMPANY_TYPE}, 4574},
     {"почтовое отделение", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"кв", 1, {DICTIONARY_UNIT_NUMBERED}, 4697},
+    {"туп", 1, {DICTIONARY_STREET_TYPE}, 4704},
     {"альфа-банк", 1, {DICTIONARY_CHAIN}, -1},
     {"мост", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"нижний этаж", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"koltsevaya", 1, {DICTIONARY_STREET_TYPE}, 4679},
+    {"кв-л", 1, {DICTIONARY_QUALIFIER}, 4665},
+    {"dor", 1, {DICTIONARY_STREET_TYPE}, 4689},
     {"фонтан", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"Ю", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"риелтор", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"место захоронения", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"вблизи", 1, {DICTIONARY_NEAR}, -1},
+    {"of", 1, {DICTIONARY_UNIT_NUMBERED}, 4715},
     {"сауна", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"pgt", 1, {DICTIONARY_QUALIFIER}, 4683},
+    {"ofis", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"близ", 1, {DICTIONARY_NEAR}, -1},
     {"y", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"пятерочка", 1, {DICTIONARY_CHAIN}, 4567},
     {"мотель", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"гм", 1, {DICTIONARY_QUALIFIER}, 4658},
-    {"спортивныи центр", 1, {DICTIONARY_PLACE_NAME}, 4623},
+    {"vtb24", 1, {DICTIONARY_CHAIN}, -1},
     {"svyatoy", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"ulica", 1, {DICTIONARY_STREET_TYPE}, 4696},
+    {"kab", 1, {DICTIONARY_UNIT_NUMBERED}, 4711},
     {"кабинет", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"s", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"фотомагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"втб24", 1, {DICTIONARY_CHAIN}, -1},
     {"teremok", 1, {DICTIONARY_CHAIN}, -1},
-    {"ryadom zdes", 1, {DICTIONARY_NEAR}, 4604},
     {"alleya", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"цок эт", 1, {DICTIONARY_LEVEL_BASEMENT}, 4595},
+    {"alfa bank", 1, {DICTIONARY_CHAIN}, 4568},
     {"rostelecom", 1, {DICTIONARY_CHAIN}, -1},
+    {"koltsevaya", 1, {DICTIONARY_STREET_TYPE}, 4690},
+    {"kv", 1, {DICTIONARY_QUALIFIER}, 4666},
     {"bliz", 1, {DICTIONARY_NEAR}, -1},
-    {"obshchestvo s ogranichennoy otvetstvennostyu", 1, {DICTIONARY_COMPANY_TYPE}, 4576},
-    {"прокат автомобилеи", 1, {DICTIONARY_PLACE_NAME}, 4613},
+    {"лит", 1, {DICTIONARY_UNIT_NUMBERED}, 4712},
     {"холл", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"o", 1, {DICTIONARY_QUALIFIER}, 4666},
     {"заповедник", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"магазин игрушек", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"bul", 1, {DICTIONARY_STREET_TYPE}, 4676},
+    {"киоск", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"посёлок городского типа", 1, {DICTIONARY_QUALIFIER}, 4682},
     {"спортивный центр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"продуктовый магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"каб", 1, {DICTIONARY_UNIT_NUMBERED}, 4699},
-    {"овощнои магазин", 1, {DICTIONARY_PLACE_NAME}, 4640},
     {"ryadom", 1, {DICTIONARY_NEAR}, -1},
+    {"severo vostoku", 1, {DICTIONARY_DIRECTIONAL}, 4582},
     {"rosneft", 1, {DICTIONARY_CHAIN}, -1},
     {"блок", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"автономная некоммерческая организация", 1, {DICTIONARY_COMPANY_TYPE}, 4570},
-    {"per", 1, {DICTIONARY_STREET_TYPE}, 4683},
+    {"караван-сараи", 1, {DICTIONARY_PLACE_NAME}, 4655},
     {"паромная станция", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"поликлиника", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"euroset", 1, {DICTIONARY_CHAIN}, -1},
@@ -81514,294 +81544,315 @@ address_expansion_rule_t expansion_rules[] = {
     {"мясная лавка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"аптека", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"юго-западу", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"перв эт", 1, {DICTIONARY_LEVEL_STANDALONE}, 4600},
     {"переулок", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"фермерскии магазин", 1, {DICTIONARY_PLACE_NAME}, 4636},
     {"святой", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"башня", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"no", 1, {DICTIONARY_NUMBER}, 4609},
     {"детская игровая площадка", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4592},
+    {"офис", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"кинотеатр", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"палатка с едои", 1, {DICTIONARY_PLACE_NAME}, 4617},
+    {"пер", 1, {DICTIONARY_STREET_TYPE}, 4693},
+    {"детскии сад", 1, {DICTIONARY_PLACE_NAME}, 4622},
     {"книжный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"kv-l", 1, {DICTIONARY_QUALIFIER}, 4666},
     {"ryadom s mnoy", 1, {DICTIONARY_NEAR}, -1},
+    {"sh", 1, {DICTIONARY_STREET_TYPE}, 4703},
     {"дом", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
     {"полиция", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"zdes", 1, {DICTIONARY_NEAR}, 4605},
-    {"р-н", 1, {DICTIONARY_QUALIFIER}, 4669},
-    {"з", 1, {DICTIONARY_DIRECTIONAL}, 4591},
+    {"lit", 1, {DICTIONARY_UNIT_NUMBERED}, 4713},
+    {"развалины", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"линия", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"общество с ограниченной ответственностью", 1, {DICTIONARY_COMPANY_TYPE}, 4575},
-    {"литера", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"ю", 1, {DICTIONARY_DIRECTIONAL}, 4587},
+    {"kvartal", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"severo zapad", 1, {DICTIONARY_DIRECTIONAL}, 4584},
+    {"pl", 1, {DICTIONARY_STREET_TYPE}, 4696},
+    {"паб", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ресторан", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"зоомагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"церковь", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"сельскии совет", 1, {DICTIONARY_QUALIFIER}, 4678},
     {"u", 1, {DICTIONARY_NEAR}, -1},
     {"vkhod", 1, {DICTIONARY_ENTRANCE}, -1},
-    {"магазин видеозаписеи", 1, {DICTIONARY_PLACE_NAME}, 4650},
-    {"караван сарай", 1, {DICTIONARY_PLACE_NAME}, 4652},
-    {"рыбныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4635},
-    {"uroven", 1, {DICTIONARY_LEVEL_NUMBERED}, 4599},
-    {"с", 1, {DICTIONARY_DIRECTIONAL}, 4577},
-    {"azs", 1, {DICTIONARY_CHAIN}, -1},
+    {"ulica", 1, {DICTIONARY_STREET_TYPE}, 4707},
+    {"горный приют", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"гм", 1, {DICTIONARY_QUALIFIER}, 4663},
+    {"z", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"alfa-bank", 1, {DICTIONARY_CHAIN}, -1},
-    {"кв-л", 1, {DICTIONARY_QUALIFIER}, 4660},
-    {"vozle", 1, {DICTIONARY_NEAR}, -1},
-    {"спортивныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4648},
+    {"tup", 1, {DICTIONARY_STREET_TYPE}, 4705},
+    {"ano", 1, {DICTIONARY_COMPANY_TYPE}, 4572},
     {"proyezd", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"nomer", 1, {DICTIONARY_NUMBER}, -1},
     {"gazprom neft", 1, {DICTIONARY_CHAIN}, -1},
-    {"городская администрация", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"теремок", 1, {DICTIONARY_CHAIN}, -1},
     {"ветеринарная клиника", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"место уличнои торговли", 1, {DICTIONARY_PLACE_NAME}, 4648},
+    {"otkrytoye aktsionernoye obshchestvo", 1, {DICTIONARY_COMPANY_TYPE}, 4576},
     {"severo-vostoku", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"офис", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"овощнои магазин", 1, {DICTIONARY_PLACE_NAME}, 4643},
     {"дом искусств", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"виноградник", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"мэрия", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"мария-ра", 1, {DICTIONARY_CHAIN}, -1},
-    {"lit", 1, {DICTIONARY_UNIT_NUMBERED}, 4702},
+    {"прокат автомобилеи", 1, {DICTIONARY_PLACE_NAME}, 4616},
     {"прокат велосипедов", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"uglu", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"sel'sovet", 1, {DICTIONARY_QUALIFIER}, 4679},
     {"ulitsa", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"домик для гостеи", 1, {DICTIONARY_PLACE_NAME}, 4656},
+    {"пр", 1, {DICTIONARY_STREET_TYPE}, 4697},
     {"палатка с едой", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"о", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"музеи", 1, {DICTIONARY_PLACE_NAME}, 4654},
-    {"kv", 1, {DICTIONARY_QUALIFIER}, 4661},
+    {"сельский совет", 1, {DICTIONARY_QUALIFIER}, -1},
     {"vblizi", 1, {DICTIONARY_NEAR}, -1},
-    {"бул", 1, {DICTIONARY_STREET_TYPE}, 4675},
     {"yugo-vostoku", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"каток", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"tsok et", 1, {DICTIONARY_LEVEL_BASEMENT}, 4596},
-    {"паб", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4614},
     {"vostok", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"kvart", 1, {DICTIONARY_QUALIFIER}, 4666},
     {"место поклонения", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"крематории", 1, {DICTIONARY_PLACE_NAME}, 4616},
     {"аэропорт", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"госпиталь", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"связной", 1, {DICTIONARY_CHAIN}, -1},
-    {"секонд хэнд", 1, {DICTIONARY_PLACE_NAME}, 4628},
-    {"эт", 1, {DICTIONARY_LEVEL_NUMBERED}, 4597},
     {"магазин одежды", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"квартира", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"аттракционы", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"караван-сарай", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"област", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"пос", 1, {DICTIONARY_QUALIFIER}, 4664},
-    {"поле для гольфа", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"uroven", 1, {DICTIONARY_LEVEL_NUMBERED}, 4601},
+    {"в", 1, {DICTIONARY_DIRECTIONAL}, 4585},
     {"туристической агентство", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"о", 1, {DICTIONARY_QUALIFIER}, 4670},
+    {"сельсовет", 1, {DICTIONARY_QUALIFIER}, 4678},
     {"бар", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"молл", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"поселок", 1, {DICTIONARY_QUALIFIER}, 4671},
+    {"палатка с едои", 1, {DICTIONARY_PLACE_NAME}, 4620},
+    {"музыкальныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4646},
     {"нко", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"аренда автомобилеи", 1, {DICTIONARY_PLACE_NAME}, 4612},
+    {"автономная некоммерческая организация", 1, {DICTIONARY_COMPANY_TYPE}, 4572},
     {"деревенское поле", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"тренажерныи зал", 1, {DICTIONARY_PLACE_NAME}, 4618},
-    {"y", 1, {DICTIONARY_DIRECTIONAL}, 4586},
-    {"pl", 1, {DICTIONARY_STREET_TYPE}, 4685},
     {"номер", 1, {DICTIONARY_NUMBER}, -1},
     {"kabinet", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"бульвар", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"al", 1, {DICTIONARY_STREET_TYPE}, 4674},
-    {"бассеин", 1, {DICTIONARY_PLACE_NAME}, 4624},
     {"пристань для яхт", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ночной клуб", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"rosselkhozbank", 1, {DICTIONARY_CHAIN}, -1},
-    {"кварт", 1, {DICTIONARY_QUALIFIER}, 4660},
+    {"поселок", 1, {DICTIONARY_QUALIFIER}, 4680},
+    {"ювелирныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4645},
+    {"перв эт", 1, {DICTIONARY_LEVEL_STANDALONE}, 4602},
     {"роспечать", 1, {DICTIONARY_CHAIN}, -1},
-    {"кооператив", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"gazpromneft", 1, {DICTIONARY_CHAIN}, 4571},
+    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4612},
+    {"трамваиная остановка", 1, {DICTIONARY_PLACE_NAME}, 4624},
+    {"магазин видеозаписеи", 1, {DICTIONARY_PLACE_NAME}, 4653},
     {"спортивный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"мебельный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"пр", 1, {DICTIONARY_STREET_TYPE}, 4687},
+    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4594},
+    {"№", 1, {DICTIONARY_NUMBER}, 4610},
     {"северо-востоку", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"укрытие", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"mikrorayon", 1, {DICTIONARY_QUALIFIER}, -1},
     {"школа", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"лин", 1, {DICTIONARY_STREET_TYPE}, 4700},
+    {"магазин моднои одежды", 1, {DICTIONARY_PLACE_NAME}, 4637},
     {"казино", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"магазин канцелярских товаров", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"raion", 1, {DICTIONARY_QUALIFIER}, -1},
     {"ugol", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"угол", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"kvart", 1, {DICTIONARY_QUALIFIER}, 4661},
-    {"gm", 1, {DICTIONARY_QUALIFIER}, 4659},
-    {"№", 1, {DICTIONARY_NUMBER}, 4607},
-    {"винныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4625},
+    {"стоматология", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"пос", 1, {DICTIONARY_QUALIFIER}, 4669},
+    {"ниж эт", 1, {DICTIONARY_LEVEL_STANDALONE}, 4604},
+    {"альфабанк", 1, {DICTIONARY_CHAIN}, 4567},
+    {"каб", 1, {DICTIONARY_UNIT_NUMBERED}, 4710},
+    {"дор", 1, {DICTIONARY_STREET_TYPE}, 4688},
+    {"der", 1, {DICTIONARY_QUALIFIER}, 4662},
+    {"посольство", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"абонементна скринька", 1, {DICTIONARY_POST_OFFICE}, -1},
     {"tatneft", 1, {DICTIONARY_CHAIN}, -1},
     {"между", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"ш", 1, {DICTIONARY_STREET_TYPE}, 4691},
-    {"садоводческии магазин", 1, {DICTIONARY_PLACE_NAME}, 4639},
+    {"с", 1, {DICTIONARY_DIRECTIONAL}, 4579},
     {"универсам", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"магазин напитков", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"аллея", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"магазин моднои одежды", 1, {DICTIONARY_PLACE_NAME}, 4634},
     {"поместье", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"оф", 1, {DICTIONARY_UNIT_NUMBERED}, 4714},
     {"korpus", 1, {DICTIONARY_BUILDING_TYPE}, -1},
     {"обмен валют", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"тюрьма", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"наб", 1, {DICTIONARY_STREET_TYPE}, 4691},
     {"тупик", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"zapad", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"r-n", 1, {DICTIONARY_QUALIFIER}, 4677},
     {"офисное здание", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ген", 1, {DICTIONARY_PERSONAL_TITLE}, 4608},
-    {"трамваиная остановка", 1, {DICTIONARY_PLACE_NAME}, 4621},
-    {"pr", 1, {DICTIONARY_STREET_TYPE}, 4688},
+    {"naberezhnaya", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"pravo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"d", 1, {DICTIONARY_HOUSE_NUMBER}, 4596},
     {"na uglu", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"к-т", 1, {DICTIONARY_UNIT_NUMBERED}, 4710},
     {"похоронное бюро", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"yugo zapadu", 1, {DICTIONARY_DIRECTIONAL}, 4592},
     {"ostrov", 1, {DICTIONARY_QUALIFIER}, -1},
     {"помещение суда", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"nekommercheskaya organizatsiya", 1, {DICTIONARY_COMPANY_TYPE}, 4571},
+    {"б / н", 1, {DICTIONARY_NO_NUMBER}, 4608},
     {"gorod", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"компьютерныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4633},
     {"такси", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"s / s", 1, {DICTIONARY_QUALIFIER}, 4679},
     {"юг", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"наб", 1, {DICTIONARY_STREET_TYPE}, 4680},
-    {"оф", 1, {DICTIONARY_UNIT_NUMBERED}, 4703},
-    {"tup", 1, {DICTIONARY_STREET_TYPE}, 4694},
+    {"площадь", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"г", 1, {DICTIONARY_QUALIFIER}, 4672},
+    {"pr", 1, {DICTIONARY_STREET_TYPE}, 4699},
+    {"садоводческии магазин", 1, {DICTIONARY_PLACE_NAME}, 4642},
+    {"tsok et", 1, {DICTIONARY_LEVEL_BASEMENT}, 4598},
+    {"тренажерныи зал", 1, {DICTIONARY_PLACE_NAME}, 4621},
     {"уровень", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"severo zapad", 1, {DICTIONARY_DIRECTIONAL}, 4582},
-    {"ночнои клуб", 1, {DICTIONARY_PLACE_NAME}, 4620},
+    {"эт", 1, {DICTIONARY_LEVEL_NUMBERED}, 4599},
+    {"д", 1, {DICTIONARY_HOUSE_NUMBER}, 4595},
     {"лукойл", 1, {DICTIONARY_CHAIN}, -1},
     {"сбербанк", 1, {DICTIONARY_CHAIN}, -1},
     {"прачечная", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"зоопарк", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"шоссе", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"tsokolnyy etazh", 1, {DICTIONARY_LEVEL_BASEMENT}, 4598},
     {"nko", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"ферма", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"nizhniy etazh", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"мебельныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4638},
-    {"kv-l", 1, {DICTIONARY_QUALIFIER}, 4661},
-    {"k", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"хостел", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"пятёрочка", 1, {DICTIONARY_CHAIN}, -1},
     {"почта россии", 1, {DICTIONARY_CHAIN}, -1},
     {"азс", 1, {DICTIONARY_CHAIN}, -1},
     {"и", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"набережная", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"лин", 1, {DICTIONARY_STREET_TYPE}, 4689},
     {"крепость", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"mezhdu", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"стоматология", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"y", 1, {DICTIONARY_DIRECTIONAL}, 4588},
     {"с", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"парикмахерская", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"zdes'", 1, {DICTIONARY_NEAR}, -1},
     {"кафе", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"gazpromneft", 1, {DICTIONARY_CHAIN}, 4569},
+    {"ларек", 1, {DICTIONARY_PLACE_NAME}, 4634},
+    {"винныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4628},
     {"корпус", 1, {DICTIONARY_BUILDING_TYPE}, -1},
     {"магазин аудио/видео аппаратуры", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"художественныи салон", 1, {DICTIONARY_PLACE_NAME}, 4626},
     {"etazh", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"туп", 1, {DICTIONARY_STREET_TYPE}, 4693},
     {"студия", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"рыбныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4638},
     {"услуги копирования", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"пос", 1, {DICTIONARY_QUALIFIER}, 4680},
     {"общественное здание", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"пожарная охрана", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"врач", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"некоммерческая организация", 1, {DICTIONARY_COMPANY_TYPE}, 4572},
-    {"продуктовыи магазин", 1, {DICTIONARY_PLACE_NAME}, 4637},
+    {"спортивныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4651},
+    {"дер", 1, {DICTIONARY_QUALIFIER}, 4661},
     {"akademika", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"сделаи-сам", 1, {DICTIONARY_PLACE_NAME}, 4635},
     {"рядом с мной", 1, {DICTIONARY_NEAR}, -1},
     {"шале", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"пос", 1, {DICTIONARY_QUALIFIER}, 4671},
-    {"альфабанк", 1, {DICTIONARY_CHAIN}, 4565},
+    {"et", 1, {DICTIONARY_LEVEL_NUMBERED}, 4600},
+    {"торговыи центр", 1, {DICTIONARY_PLACE_NAME}, 4650},
     {"ано", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"lestnitsa", 1, {DICTIONARY_STAIRCASE}, -1},
     {"химчистка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"газетный киоск", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"общество с ограниченной ответственностью", 1, {DICTIONARY_COMPANY_TYPE}, 4577},
     {"linya", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"место утилизации", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"б.н", 1, {DICTIONARY_NO_NUMBER}, 4608},
     {"makdonalds", 1, {DICTIONARY_CHAIN}, -1},
+    {"selsovet", 1, {DICTIONARY_QUALIFIER}, 4679},
     {"doroga", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"&", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4609},
     {"квартал", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"nab", 1, {DICTIONARY_STREET_TYPE}, 4681},
+    {"posolok", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"abonementnykh skrynka", 1, {DICTIONARY_POST_OFFICE}, 4658},
+    {"severo-zapad", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"сделаи сам", 1, {DICTIONARY_PLACE_NAME}, 4635},
     {"abonementnykh skrynʹka", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"юго-востоку", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"der", 1, {DICTIONARY_QUALIFIER}, 4657},
+    {"газпромнефть", 1, {DICTIONARY_CHAIN}, 4570},
     {"театр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"цветочный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"nizh et", 1, {DICTIONARY_LEVEL_STANDALONE}, 4603},
+    {"alfabank", 1, {DICTIONARY_CHAIN}, 4568},
     {"ryadom s", 1, {DICTIONARY_NEAR}, -1},
-    {"pravo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"gm", 1, {DICTIONARY_QUALIFIER}, 4664},
     {"ларёк", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"университет", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"k-t", 1, {DICTIONARY_UNIT_NUMBERED}, 4700},
+    {"ag", 1, {DICTIONARY_QUALIFIER}, 4660},
     {"магазин мобильных телефонов", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"спортивная дорожка", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"d", 1, {DICTIONARY_HOUSE_NUMBER}, 4594},
-    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4696},
     {"рыбный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"no", 1, {DICTIONARY_NUMBER}, 4606},
+    {"газпром нефть", 1, {DICTIONARY_CHAIN}, -1},
     {"к", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"yugo vostoku", 1, {DICTIONARY_DIRECTIONAL}, 4588},
+    {"per", 1, {DICTIONARY_STREET_TYPE}, 4694},
+    {"запад", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"сбербанк россии", 1, {DICTIONARY_CHAIN}, -1},
     {"место уличной торговли", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"поблизости", 1, {DICTIONARY_NEAR}, -1},
     {"остров", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4584},
+    {"св", 1, {DICTIONARY_PERSONAL_TITLE}, 4613},
     {"общественный центр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"садоводческий магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"аг", 1, {DICTIONARY_QUALIFIER}, 4659},
     {"мороженное", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"бункер", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"евросеть", 1, {DICTIONARY_CHAIN}, -1},
+    {"аренда автомобилеи", 1, {DICTIONARY_PLACE_NAME}, 4615},
     {"зона отдыха", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"дом престарелых", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"северо востоку", 1, {DICTIONARY_DIRECTIONAL}, 4581},
     {"автобусная станция", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4611},
-    {"к", 1, {DICTIONARY_BUILDING_TYPE}, 4563},
-    {"горныи приют", 1, {DICTIONARY_PLACE_NAME}, 4651},
-    {"g", 1, {DICTIONARY_QUALIFIER}, 4668},
-    {"д", 1, {DICTIONARY_HOUSE_NUMBER}, 4593},
+    {"магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"юго западу", 1, {DICTIONARY_DIRECTIONAL}, 4591},
+    {"pos", 1, {DICTIONARY_QUALIFIER}, 4681},
     {"з", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"tsokolnyy etazh", 1, {DICTIONARY_LEVEL_BASEMENT}, 4596},
+    {"sel'skiy sovet", 1, {DICTIONARY_QUALIFIER}, -1},
     {"сад", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"общественныи центр", 1, {DICTIONARY_PLACE_NAME}, 4615},
     {"levo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"караван сараи", 1, {DICTIONARY_PLACE_NAME}, 4652},
     {"аренда автомобилей", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"автомоика", 1, {DICTIONARY_PLACE_NAME}, 4614},
     {"kooperativ", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"музыкальныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4643},
+    {"№", 1, {DICTIONARY_NUMBER}, 4609},
+    {"продуктовыи магазин", 1, {DICTIONARY_PLACE_NAME}, 4640},
+    {"k", 1, {DICTIONARY_BUILDING_TYPE}, 4566},
+    {"музеи", 1, {DICTIONARY_PLACE_NAME}, 4657},
     {"d", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"площадь", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"теремок", 1, {DICTIONARY_CHAIN}, -1},
+    {"бул", 1, {DICTIONARY_STREET_TYPE}, 4686},
+    {"городская администрация", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"булочная", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"но", 1, {DICTIONARY_NUMBER}, 4606},
     {"компьютерный магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"дер", 1, {DICTIONARY_QUALIFIER}, 4656},
     {"ооо", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"компьютерныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4630},
     {"генерала", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"perv et", 1, {DICTIONARY_LEVEL_STANDALONE}, 4603},
     {"прокат автомобилей", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"город", 1, {DICTIONARY_QUALIFIER}, -1},
     {"северо-Запад", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"макдоналдс", 1, {DICTIONARY_CHAIN}, -1},
+    {"спортивныи газон", 1, {DICTIONARY_PLACE_NAME}, 4625},
+    {"р-н", 1, {DICTIONARY_QUALIFIER}, 4676},
     {"на углу", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"банкомат", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"к", 1, {DICTIONARY_UNIT_NUMBERED}, 4710},
     {"g", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"автошкола", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ш", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"yugo zapadu", 1, {DICTIONARY_DIRECTIONAL}, 4590},
-    {"сделай сам", 1, {DICTIONARY_PLACE_NAME}, 4632},
-    {"gazprom-neft", 1, {DICTIONARY_CHAIN}, 4569},
     {"минигольф", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"generala", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"альфа банк", 1, {DICTIONARY_CHAIN}, 4567},
     {"микрорайон", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"некоммерческая организация", 1, {DICTIONARY_COMPANY_TYPE}, 4574},
+    {"kv", 1, {DICTIONARY_UNIT_NUMBERED}, 4709},
     {"рядом здесь", 1, {DICTIONARY_NEAR}, -1},
-    {"пом", 1, {DICTIONARY_UNIT_NUMBERED}, 4705},
     {"трамвайная остановка", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"посольство", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"severo-zapad", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"бн", 1, {DICTIONARY_NO_NUMBER}, 4608},
+    {"магазин бытовои химии", 1, {DICTIONARY_PLACE_NAME}, 4632},
     {"улица", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"татнефть", 1, {DICTIONARY_CHAIN}, -1},
-    {"газпром нефть", 1, {DICTIONARY_CHAIN}, -1},
+    {"k", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"детский сад", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"возле", 1, {DICTIONARY_NEAR}, -1},
     {"бассейн", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"kv", 1, {DICTIONARY_UNIT_NUMBERED}, 4698},
+    {"спортивныи центр", 1, {DICTIONARY_PLACE_NAME}, 4626},
     {"poblizosti", 1, {DICTIONARY_NEAR}, -1},
-    {"ювелирныи магазин", 1, {DICTIONARY_PLACE_NAME}, 4642},
     {"автозапчасти", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"pod", 1, {DICTIONARY_NEAR}, -1},
-    {"газпромнефть", 1, {DICTIONARY_CHAIN}, 4568},
     {"tara", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"mw", 1, {DICTIONARY_STREET_TYPE}, 4707},
     {"bank eka", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"apana sala", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"mawatha", 1, {DICTIONARY_STREET_TYPE}, -1},
@@ -81812,390 +81863,391 @@ address_expansion_rule_t expansion_rules[] = {
     {"nuwara", 1, {DICTIONARY_QUALIFIER}, -1},
     {"bet sappuwa", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"hotela", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"mw", 1, {DICTIONARY_STREET_TYPE}, 4718},
     {"pura", 1, {DICTIONARY_QUALIFIER}, -1},
     {"vihara", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"gama", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"stadion", 1, {DICTIONARY_PLACE_NAME}, 4770},
+    {"j", 1, {DICTIONARY_DIRECTIONAL}, 4720},
+    {"kapitana", 1, {DICTIONARY_PERSONAL_TITLE}, 4757},
     {"východný", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"por", 1, {DICTIONARY_PERSONAL_TITLE}, 4763},
     {"park", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"arm gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4753},
     {"sväty", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"nadzemne podlazie", 1, {DICTIONARY_LEVEL_NUMBERED}, 4733},
+    {"podplukovníka", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"v blízkosti", 1, {DICTIONARY_NEAR}, -1},
-    {"juzny", 1, {DICTIONARY_DIRECTIONAL}, 4712},
-    {"porucika", 1, {DICTIONARY_PERSONAL_TITLE}, 4752},
-    {"kniznica", 1, {DICTIONARY_PLACE_NAME}, 4762},
-    {"cislo", 1, {DICTIONARY_NUMBER}, 4741},
+    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4765},
     {"okolo", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
     {"sever", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4743},
-    {"nadvorie", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"vychod", 1, {DICTIONARY_DIRECTIONAL}, 4721},
-    {"zapadna", 1, {DICTIONARY_DIRECTIONAL}, 4726},
-    {"blizko", 1, {DICTIONARY_STOPWORD}, 4779},
-    {"podplukovnika", 1, {DICTIONARY_PERSONAL_TITLE}, 4751},
+    {"postova priehradka", 1, {DICTIONARY_POST_OFFICE}, 4787},
+    {"úrad", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"materska skola", 1, {DICTIONARY_PLACE_NAME}, 4777},
+    {"severna", 1, {DICTIONARY_DIRECTIONAL}, 4727},
+    {"generala", 1, {DICTIONARY_PERSONAL_TITLE}, 4755},
+    {"ing", 1, {DICTIONARY_PERSONAL_TITLE}, 4756},
+    {"materská škola", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"poschodie", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"obecný úrad", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"krala", 1, {DICTIONARY_PERSONAL_TITLE}, 4747},
+    {"hradska", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"generála", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"u", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
     {"izba", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"súpisné číslo", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
-    {"zapadny", 1, {DICTIONARY_DIRECTIONAL}, 4728},
-    {"tovarenska", 1, {DICTIONARY_PLACE_NAME}, 4772},
+    {"kancelaria", 1, {DICTIONARY_UNIT_NUMBERED}, 4804},
     {"na", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
-    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4755},
-    {"nám", 1, {DICTIONARY_STREET_TYPE}, 4785},
+    {"trat", 1, {DICTIONARY_STREET_TYPE}, 4797},
+    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4803},
     {"východná", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"podporucika", 1, {DICTIONARY_PERSONAL_TITLE}, 4753},
-    {"lava", 1, {DICTIONARY_UNIT_DIRECTION}, 4790},
-    {"dvor", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"s. c", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
-    {"sč", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
+    {"vedĺa", 1, {DICTIONARY_STOPWORD}, -1},
+    {"ppor", 1, {DICTIONARY_PERSONAL_TITLE}, 4764},
+    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4768},
     {"juh", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"s c", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
     {"korzo", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"číslo", 1, {DICTIONARY_NUMBER}, -1},
     {"o", 1, {DICTIONARY_STOPWORD}, -1},
-    {"nabr", 1, {DICTIONARY_STREET_TYPE}, 4784},
-    {"apartmán", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"podplukovníka", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"juzne", 1, {DICTIONARY_DIRECTIONAL}, 4711},
+    {"supisne cislo", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
+    {"stred", 1, {DICTIONARY_QUALIFIER}, 4789},
+    {"skolska", 1, {DICTIONARY_PLACE_NAME}, 4780},
+    {"blizko", 1, {DICTIONARY_STOPWORD}, 4790},
+    {"krcma", 1, {DICTIONARY_PLACE_NAME}, 4774},
+    {"pravá", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"naproti", 1, {DICTIONARY_STOPWORD}, -1},
-    {"v okolí", 1, {DICTIONARY_NEAR}, -1},
-    {"ing", 1, {DICTIONARY_PERSONAL_TITLE}, 4745},
+    {"kpt", 1, {DICTIONARY_PERSONAL_TITLE}, 4757},
+    {"plukovníka", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"svätého", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"tady blizkosti", 1, {DICTIONARY_NEAR}, 4737},
-    {"severovýchod", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"južné", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"etáž", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"zapadne", 1, {DICTIONARY_DIRECTIONAL}, 4727},
     {"poručíka", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"prizemie", 1, {DICTIONARY_LEVEL_STANDALONE}, 4734},
-    {"vedla", 1, {DICTIONARY_STOPWORD}, 4780},
-    {"apartman", 1, {DICTIONARY_UNIT_NUMBERED}, 4792},
+    {"vychodne", 1, {DICTIONARY_DIRECTIONAL}, 4734},
+    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4798},
+    {"nadvorie", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"nadzemne podlazie", 1, {DICTIONARY_LEVEL_NUMBERED}, 4744},
+    {"juhozapad", 1, {DICTIONARY_DIRECTIONAL}, 4725},
     {"severozápad", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"západné", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"armadneho generala", 1, {DICTIONARY_PERSONAL_TITLE}, 4753},
     {"továrenská", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"čsl", 1, {DICTIONARY_TOPONYM}, 4789},
-    {"stred", 1, {DICTIONARY_QUALIFIER}, 4778},
+    {"molo", 1, {DICTIONARY_STREET_TYPE}, 4794},
     {"pre", 1, {DICTIONARY_STOPWORD}, -1},
-    {"svateho", 1, {DICTIONARY_PERSONAL_TITLE}, 4756},
-    {"gymnazium", 1, {DICTIONARY_PLACE_NAME}, 4759},
-    {"namestie", 1, {DICTIONARY_STREET_TYPE}, 4785},
-    {"materska skola", 1, {DICTIONARY_PLACE_NAME}, 4766},
+    {"v blizkosti tu", 1, {DICTIONARY_NEAR}, 4749},
+    {"alej", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"hradna", 1, {DICTIONARY_PLACE_NAME}, 4771},
     {"základná škola", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"centrum", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"podporučíka", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"s.č.", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
-    {"s. c.", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
-    {"juhozapad", 1, {DICTIONARY_DIRECTIONAL}, 4714},
-    {"por", 1, {DICTIONARY_PERSONAL_TITLE}, 4752},
-    {"armadneho generala", 1, {DICTIONARY_PERSONAL_TITLE}, 4742},
-    {"č", 1, {DICTIONARY_NUMBER}, 4741},
-    {"sídl", 1, {DICTIONARY_QUALIFIER}, 4777},
+    {"tu", 1, {DICTIONARY_NEAR}, -1},
+    {"brána", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"pred", 1, {DICTIONARY_STOPWORD}, -1},
+    {"ceskoslovenskej", 1, {DICTIONARY_TOPONYM}, 4800},
     {"domov", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"tady blízkosti", 1, {DICTIONARY_NEAR}, -1},
-    {"dom kultúry", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"č", 1, {DICTIONARY_NUMBER}, 4752},
+    {"s. c.", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
     {"trať", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4754},
-    {"so", 1, {DICTIONARY_STOPWORD}, -1},
-    {"úrad", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"lavá", 1, {DICTIONARY_UNIT_DIRECTION}, 4801},
+    {"zapadny", 1, {DICTIONARY_DIRECTIONAL}, 4739},
     {"ulička", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"severovychod", 1, {DICTIONARY_DIRECTIONAL}, 4719},
     {"chodnik", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"k", 1, {DICTIONARY_STOPWORD}, -1},
+    {"tady blizkosti", 1, {DICTIONARY_NEAR}, 4748},
+    {"np", 1, {DICTIONARY_LEVEL_NUMBERED}, 4744},
     {"kaviareň", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"kostol", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4721},
+    {"západný", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"cez", 1, {DICTIONARY_STOPWORD}, -1},
+    {"v blizkosti", 1, {DICTIONARY_NEAR}, 4750},
     {"&", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"zapad", 1, {DICTIONARY_DIRECTIONAL}, 4725},
+    {"lekaren", 1, {DICTIONARY_PLACE_NAME}, 4776},
     {"hradná", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"dom", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"stanica", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"juhovýchod", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"sakladna skola", 1, {DICTIONARY_PLACE_NAME}, 4775},
+    {"zapadna", 1, {DICTIONARY_DIRECTIONAL}, 4737},
     {"z", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_STOPWORD}, -1},
-    {"kaviaren", 1, {DICTIONARY_PLACE_NAME}, 4761},
-    {"pravá", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"apartmán", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"kulturny dom", 1, {DICTIONARY_PLACE_NAME}, 4775},
     {"kino", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"sidlisko", 1, {DICTIONARY_QUALIFIER}, 4777},
-    {"blizkosti", 1, {DICTIONARY_NEAR}, 4736},
-    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4715},
-    {"urad", 1, {DICTIONARY_PLACE_NAME}, 4774},
-    {"prava", 1, {DICTIONARY_UNIT_DIRECTION}, 4791},
-    {"inziniera", 1, {DICTIONARY_PERSONAL_TITLE}, 4745},
-    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4792},
-    {"kpt", 1, {DICTIONARY_PERSONAL_TITLE}, 4746},
+    {"csl", 1, {DICTIONARY_TOPONYM}, 4800},
+    {"v okoli", 1, {DICTIONARY_NEAR}, 4751},
+    {"plk", 1, {DICTIONARY_PERSONAL_TITLE}, 4761},
+    {"restauracia", 1, {DICTIONARY_PLACE_NAME}, 4779},
+    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4736},
+    {"s. č", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
+    {"s.c", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
+    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4726},
+    {"prava", 1, {DICTIONARY_UNIT_DIRECTION}, 4802},
+    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4755},
     {"ulica", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"mjr", 1, {DICTIONARY_PERSONAL_TITLE}, 4748},
     {"vo", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
-    {"severna", 1, {DICTIONARY_DIRECTIONAL}, 4716},
-    {"stredna odborna skola", 1, {DICTIONARY_PLACE_NAME}, 4771},
-    {"s.c", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
-    {"s. č", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
-    {"hradna", 1, {DICTIONARY_PLACE_NAME}, 4760},
+    {"kultúrny dom", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"ulicka", 1, {DICTIONARY_STREET_TYPE}, 4799},
     {"svätá", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"pri", 1, {DICTIONARY_STOPWORD}, -1},
-    {"mimo", 1, {DICTIONARY_STOPWORD}, -1},
-    {"ppor", 1, {DICTIONARY_PERSONAL_TITLE}, 4753},
-    {"s c", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
+    {"kral'a", 1, {DICTIONARY_PERSONAL_TITLE}, 4758},
+    {"podlazie", 1, {DICTIONARY_LEVEL_NUMBERED}, 4743},
+    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4767},
     {"do", 1, {DICTIONARY_STOPWORD}, -1},
-    {"v okoli", 1, {DICTIONARY_NEAR}, 4740},
+    {"svateho", 1, {DICTIONARY_PERSONAL_TITLE}, 4767},
     {"oproti", 1, {DICTIONARY_STOPWORD}, -1},
+    {"s. c", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
     {"nadzemné podlažie", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"generala", 1, {DICTIONARY_PERSONAL_TITLE}, 4744},
+    {"nábrežie", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"cesta", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"mjr", 1, {DICTIONARY_PERSONAL_TITLE}, 4759},
+    {"podplukovnika", 1, {DICTIONARY_PERSONAL_TITLE}, 4762},
     {"gymnázium", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"pole", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"západná", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"kulturny dom", 1, {DICTIONARY_PLACE_NAME}, 4764},
+    {"nam", 1, {DICTIONARY_STREET_TYPE}, 4796},
+    {"kopec", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"východné", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"ľavá", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"juzny", 1, {DICTIONARY_DIRECTIONAL}, 4723},
+    {"stredisko", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"cislo", 1, {DICTIONARY_NUMBER}, 4752},
+    {"ku", 1, {DICTIONARY_STOPWORD}, -1},
+    {"severovychod", 1, {DICTIONARY_DIRECTIONAL}, 4730},
     {"roh", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"školská", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"alej", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4757},
-    {"molo", 1, {DICTIONARY_STREET_TYPE}, 4783},
-    {"vychodny", 1, {DICTIONARY_DIRECTIONAL}, 4724},
-    {"juhovychod", 1, {DICTIONARY_DIRECTIONAL}, 4713},
-    {"podlazie", 1, {DICTIONARY_LEVEL_NUMBERED}, 4732},
-    {"krcma", 1, {DICTIONARY_PLACE_NAME}, 4763},
-    {"južné", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"chodnick", 1, {DICTIONARY_STREET_TYPE}, 4782},
+    {"inziniera", 1, {DICTIONARY_PERSONAL_TITLE}, 4756},
+    {"zod", 1, {DICTIONARY_STOPWORD}, -1},
+    {"centr", 1, {DICTIONARY_DIRECTIONAL}, 4719},
+    {"mimo", 1, {DICTIONARY_STOPWORD}, -1},
+    {"s.č.", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
+    {"so", 1, {DICTIONARY_STOPWORD}, -1},
+    {"severovýchod", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"nábr", 1, {DICTIONARY_STREET_TYPE}, 4795},
     {"kapitána", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"plk", 1, {DICTIONARY_PERSONAL_TITLE}, 4750},
+    {"namestie", 1, {DICTIONARY_STREET_TYPE}, 4796},
     {"profesora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"reštaurácia", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"a", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
     {"severné", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"podzemne podlazie", 1, {DICTIONARY_LEVEL_BASEMENT}, 4730},
-    {"kultúrny dom", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"kniznica", 1, {DICTIONARY_PLACE_NAME}, 4773},
+    {"c", 1, {DICTIONARY_NUMBER}, 4752},
+    {"blizko", 1, {DICTIONARY_NEAR}, 4746},
     {"v blízkosti mne", 1, {DICTIONARY_NEAR}, -1},
-    {"tu", 1, {DICTIONARY_NEAR}, -1},
+    {"s.č", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
+    {"podporucika", 1, {DICTIONARY_PERSONAL_TITLE}, 4764},
     {"blízko", 1, {DICTIONARY_NEAR}, -1},
-    {"nabrezie", 1, {DICTIONARY_STREET_TYPE}, 4784},
+    {"stadion", 1, {DICTIONARY_PLACE_NAME}, 4781},
     {"umelecká škola", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"svätej", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"juhozápad", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"na rohu", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"etaz", 1, {DICTIONARY_LEVEL_NUMBERED}, 4731},
+    {"nám", 1, {DICTIONARY_STREET_TYPE}, 4796},
     {"sídlisko", 1, {DICTIONARY_QUALIFIER}, -1},
     {"knižnica", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"kapitana", 1, {DICTIONARY_PERSONAL_TITLE}, 4746},
-    {"obecny urad", 1, {DICTIONARY_PLACE_NAME}, 4767},
-    {"doktora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pplk", 1, {DICTIONARY_PERSONAL_TITLE}, 4751},
-    {"v blízkosti tu", 1, {DICTIONARY_NEAR}, -1},
-    {"brána", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"arm gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4742},
-    {"csl", 1, {DICTIONARY_TOPONYM}, 4789},
-    {"krčma", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"osada", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"doktora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"podzemne podlazie", 1, {DICTIONARY_LEVEL_BASEMENT}, 4741},
+    {"v blízkosti tu", 1, {DICTIONARY_NEAR}, -1},
+    {"československej", 1, {DICTIONARY_TOPONYM}, -1},
+    {"tovarenska", 1, {DICTIONARY_PLACE_NAME}, 4783},
+    {"krčma", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"juzne", 1, {DICTIONARY_DIRECTIONAL}, 4722},
     {"j", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4725},
-    {"nábr", 1, {DICTIONARY_STREET_TYPE}, 4784},
-    {"supisne cislo", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
-    {"v blizkosti tu", 1, {DICTIONARY_NEAR}, 4738},
-    {"cesta", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"svaty", 1, {DICTIONARY_PERSONAL_TITLE}, 4755},
-    {"restauracia", 1, {DICTIONARY_PLACE_NAME}, 4768},
+    {"severozapad", 1, {DICTIONARY_DIRECTIONAL}, 4731},
+    {"promenada", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"sč", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
     {"severný", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"nemocnica", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"lekaren", 1, {DICTIONARY_PLACE_NAME}, 4765},
+    {"svaty", 1, {DICTIONARY_PERSONAL_TITLE}, 4766},
     {"ponad", 1, {DICTIONARY_STOPWORD}, -1},
+    {"svatej", 1, {DICTIONARY_PERSONAL_TITLE}, 4768},
     {"s", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_STOPWORD}, -1},
-    {"vedĺa", 1, {DICTIONARY_STOPWORD}, -1},
     {"popri", 1, {DICTIONARY_STOPWORD}, -1},
-    {"dom kultury", 1, {DICTIONARY_PLACE_NAME}, 4758},
-    {"materská škola", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"np", 1, {DICTIONARY_LEVEL_NUMBERED}, 4733},
+    {"prizemie", 1, {DICTIONARY_LEVEL_STANDALONE}, 4745},
+    {"lava", 1, {DICTIONARY_UNIT_DIRECTION}, 4801},
+    {"vychod", 1, {DICTIONARY_DIRECTIONAL}, 4732},
+    {"severny", 1, {DICTIONARY_DIRECTIONAL}, 4729},
+    {"v okolí", 1, {DICTIONARY_NEAR}, -1},
     {"poštová priehradka", 1, {DICTIONARY_POST_OFFICE}, -1},
     {"bližko", 1, {DICTIONARY_STOPWORD}, -1},
     {"západ", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"československej", 1, {DICTIONARY_TOPONYM}, -1},
-    {"s.c.", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
-    {"stredisko", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"severne", 1, {DICTIONARY_DIRECTIONAL}, 4717},
+    {"sc", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
+    {"vychodna", 1, {DICTIONARY_DIRECTIONAL}, 4733},
+    {"dom kultury", 1, {DICTIONARY_PLACE_NAME}, 4769},
+    {"plukovnika", 1, {DICTIONARY_PERSONAL_TITLE}, 4761},
+    {"umelecka skola", 1, {DICTIONARY_PLACE_NAME}, 4784},
     {"kaplnka", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"vychodne", 1, {DICTIONARY_DIRECTIONAL}, 4723},
-    {"severny", 1, {DICTIONARY_DIRECTIONAL}, 4718},
-    {"pod", 1, {DICTIONARY_STOPWORD}, -1},
-    {"ceskoslovenskej", 1, {DICTIONARY_TOPONYM}, 4789},
+    {"nabrezie", 1, {DICTIONARY_STREET_TYPE}, 4795},
+    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4766},
+    {"sidlisko", 1, {DICTIONARY_QUALIFIER}, 4788},
+    {"blizkosti", 1, {DICTIONARY_NEAR}, 4747},
+    {"vedla", 1, {DICTIONARY_STOPWORD}, 4791},
+    {"čsl", 1, {DICTIONARY_TOPONYM}, 4800},
+    {"brana", 1, {DICTIONARY_STREET_TYPE}, 4792},
+    {"juzna", 1, {DICTIONARY_DIRECTIONAL}, 4721},
     {"divadlo", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"blizko", 1, {DICTIONARY_NEAR}, 4735},
-    {"juzna", 1, {DICTIONARY_DIRECTIONAL}, 4710},
+    {"zapad", 1, {DICTIONARY_DIRECTIONAL}, 4736},
+    {"prof", 1, {DICTIONARY_PERSONAL_TITLE}, 4760},
+    {"dom kultúry", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"terasa", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"ulicka", 1, {DICTIONARY_STREET_TYPE}, 4788},
     {"kráľa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"kopec", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"prof", 1, {DICTIONARY_PERSONAL_TITLE}, 4749},
-    {"postova priehradka", 1, {DICTIONARY_POST_OFFICE}, 4776},
-    {"hradska", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"severozapad", 1, {DICTIONARY_DIRECTIONAL}, 4720},
+    {"obecny urad", 1, {DICTIONARY_PLACE_NAME}, 4778},
+    {"nabr", 1, {DICTIONARY_STREET_TYPE}, 4795},
+    {"pplk", 1, {DICTIONARY_PERSONAL_TITLE}, 4762},
+    {"kaviaren", 1, {DICTIONARY_PLACE_NAME}, 4772},
     {"armádneho generála", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"svata", 1, {DICTIONARY_PERSONAL_TITLE}, 4754},
+    {"sakladna skola", 1, {DICTIONARY_PLACE_NAME}, 4786},
+    {"pole", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"námestie", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"vychodna", 1, {DICTIONARY_DIRECTIONAL}, 4722},
-    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4756},
     {"majora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"tady", 1, {DICTIONARY_NEAR}, -1},
-    {"nam", 1, {DICTIONARY_STREET_TYPE}, 4785},
-    {"lavá", 1, {DICTIONARY_UNIT_DIRECTION}, 4790},
+    {"k", 1, {DICTIONARY_STOPWORD}, -1},
     {"v", 4, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_CROSS_STREET, DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
-    {"banka", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"skolska", 1, {DICTIONARY_PLACE_NAME}, 4769},
-    {"j", 1, {DICTIONARY_DIRECTIONAL}, 4709},
+    {"zapadne", 1, {DICTIONARY_DIRECTIONAL}, 4738},
+    {"sídl", 1, {DICTIONARY_QUALIFIER}, 4788},
+    {"apartman", 1, {DICTIONARY_UNIT_NUMBERED}, 4803},
+    {"s. č.", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
     {"haj", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"západný", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"porucika", 1, {DICTIONARY_PERSONAL_TITLE}, 4763},
     {"prízemie", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"sc", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
-    {"umelecka skola", 1, {DICTIONARY_PLACE_NAME}, 4773},
-    {"pred", 1, {DICTIONARY_STOPWORD}, -1},
+    {"s.c.", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
+    {"dvor", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"svata", 1, {DICTIONARY_PERSONAL_TITLE}, 4765},
+    {"pod", 1, {DICTIONARY_STOPWORD}, -1},
+    {"stredna odborna skola", 1, {DICTIONARY_PLACE_NAME}, 4782},
     {"stredná odborná škola", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"mólo", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"nábrežie", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"v blizkosti", 1, {DICTIONARY_NEAR}, 4739},
-    {"pp", 1, {DICTIONARY_LEVEL_BASEMENT}, 4730},
+    {"krala", 1, {DICTIONARY_PERSONAL_TITLE}, 4758},
+    {"chodnick", 1, {DICTIONARY_STREET_TYPE}, 4793},
+    {"pp", 1, {DICTIONARY_LEVEL_BASEMENT}, 4741},
+    {"západná", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"trh", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"blízkosti", 1, {DICTIONARY_NEAR}, -1},
     {"lekáreň", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4787},
+    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4754},
+    {"ľavá", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"vchod", 1, {DICTIONARY_ENTRANCE}, -1},
     {"južná", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"svatej", 1, {DICTIONARY_PERSONAL_TITLE}, 4757},
-    {"promenada", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"s č", 1, {DICTIONARY_HOUSE_NUMBER}, 4740},
     {"i", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"smerom", 1, {DICTIONARY_STOPWORD}, -1},
-    {"brana", 1, {DICTIONARY_STREET_TYPE}, 4781},
+    {"banka", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"štadión", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"severná", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"schodisko", 1, {DICTIONARY_STAIRCASE}, -1},
     {"podlažie", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"plukovnika", 1, {DICTIONARY_PERSONAL_TITLE}, 4750},
-    {"trat", 1, {DICTIONARY_STREET_TYPE}, 4786},
+    {"urad", 1, {DICTIONARY_PLACE_NAME}, 4785},
     {"medzi", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
-    {"plukovníka", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"kancelaria", 1, {DICTIONARY_UNIT_NUMBERED}, 4793},
     {"podzemné podlažie", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
-    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4744},
-    {"kral'a", 1, {DICTIONARY_PERSONAL_TITLE}, 4747},
-    {"s. č.", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
+    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4732},
+    {"juhovychod", 1, {DICTIONARY_DIRECTIONAL}, 4724},
     {"c", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"kancelária", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"zod", 1, {DICTIONARY_STOPWORD}, -1},
-    {"s č", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
+    {"etaz", 1, {DICTIONARY_LEVEL_NUMBERED}, 4742},
+    {"vychodny", 1, {DICTIONARY_DIRECTIONAL}, 4735},
     {"východ", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"centr", 1, {DICTIONARY_DIRECTIONAL}, 4708},
     {"za", 1, {DICTIONARY_STOPWORD}, -1},
     {"inžiniera", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"s.č", 1, {DICTIONARY_HOUSE_NUMBER}, 4729},
+    {"gymnazium", 1, {DICTIONARY_PLACE_NAME}, 4770},
     {"južný", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"c", 1, {DICTIONARY_NUMBER}, 4741},
-    {"ku", 1, {DICTIONARY_STOPWORD}, -1},
+    {"severne", 1, {DICTIONARY_DIRECTIONAL}, 4728},
+    {"nemocnica", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"zgornje", 1, {DICTIONARY_SYNONYM}, -1},
-    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4797},
+    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4807},
     {"brez številke", 1, {DICTIONARY_NO_NUMBER}, -1},
     {"sever", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"velika", 1, {DICTIONARY_SYNONYM}, -1},
+    {"sr", 1, {DICTIONARY_SYNONYM}, 4826},
     {"spodnje", 1, {DICTIONARY_SYNONYM}, -1},
+    {"zg", 1, {DICTIONARY_SYNONYM}, 4832},
+    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4817},
     {"na", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
     {"srednji", 1, {DICTIONARY_SYNONYM}, -1},
-    {"stopnisce", 1, {DICTIONARY_STAIRCASE}, 4808},
+    {"št", 1, {DICTIONARY_NUMBER}, 4814},
+    {"v", 1, {DICTIONARY_SYNONYM}, 4830},
     {"veliko", 1, {DICTIONARY_SYNONYM}, -1},
-    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4796},
-    {"sp", 1, {DICTIONARY_SYNONYM}, 4813},
+    {"br", 1, {DICTIONARY_PERSONAL_TITLE}, 4815},
+    {"brez št", 1, {DICTIONARY_NO_NUMBER}, 4813},
+    {"zgornji", 1, {DICTIONARY_SYNONYM}, -1},
     {"soba", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"sr", 1, {DICTIONARY_SYNONYM}, 4814},
     {"na vogalu", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"zg", 1, {DICTIONARY_SYNONYM}, 4822},
-    {"sr", 1, {DICTIONARY_SYNONYM}, 4816},
-    {"j", 1, {DICTIONARY_DIRECTIONAL}, 4795},
+    {"v", 1, {DICTIONARY_SYNONYM}, 4829},
     {"pot", 2, {DICTIONARY_STOPWORD, DICTIONARY_STREET_TYPE}, -1},
-    {"trg", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"grajska", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"pritličje", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"parter", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"zg", 1, {DICTIONARY_SYNONYM}, 4821},
     {"ob", 1, {DICTIONARY_STOPWORD}, -1},
-    {"brez št", 1, {DICTIONARY_NO_NUMBER}, 4802},
-    {"spodnja", 1, {DICTIONARY_SYNONYM}, -1},
-    {"dm", 1, {DICTIONARY_CHAIN}, -1},
-    {"z", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"pritlicje", 1, {DICTIONARY_LEVEL_STANDALONE}, 4799},
+    {"j", 1, {DICTIONARY_DIRECTIONAL}, 4806},
     {"tukaj", 1, {DICTIONARY_NEAR}, -1},
+    {"trg", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"dm", 1, {DICTIONARY_CHAIN}, -1},
+    {"sp", 1, {DICTIONARY_SYNONYM}, 4823},
+    {"z", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"sp", 1, {DICTIONARY_SYNONYM}, 4824},
+    {"sr", 1, {DICTIONARY_SYNONYM}, 4825},
+    {"brez st", 1, {DICTIONARY_NO_NUMBER}, 4813},
     {"ulica", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4816},
+    {"v blizini tukaj", 1, {DICTIONARY_NEAR}, 4812},
     {"veliki", 1, {DICTIONARY_SYNONYM}, -1},
-    {"v blizini", 1, {DICTIONARY_NEAR}, 4800},
     {"pri", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
     {"v bližini tukaj", 1, {DICTIONARY_NEAR}, -1},
     {"blizu mene", 1, {DICTIONARY_NEAR}, -1},
-    {"zgornji", 1, {DICTIONARY_SYNONYM}, -1},
     {"cesta", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"stopnišče", 1, {DICTIONARY_STAIRCASE}, -1},
-    {"zg", 1, {DICTIONARY_SYNONYM}, 4823},
-    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4810},
-    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4806},
-    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4798},
     {"srednja", 1, {DICTIONARY_SYNONYM}, -1},
     {"sveta", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"st", 1, {DICTIONARY_NUMBER}, 4814},
     {"urad", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"sp", 1, {DICTIONARY_SYNONYM}, 4812},
-    {"p.p", 1, {DICTIONARY_POST_OFFICE}, 4807},
-    {"v", 1, {DICTIONARY_SYNONYM}, 4819},
+    {"v", 1, {DICTIONARY_SYNONYM}, 4828},
     {"spodnji", 1, {DICTIONARY_SYNONYM}, -1},
+    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4821},
+    {"sr", 1, {DICTIONARY_SYNONYM}, 4827},
     {"stanovanje", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"poštni predal", 1, {DICTIONARY_POST_OFFICE}, -1},
     {"zahod", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"vas", 1, {DICTIONARY_STOPWORD}, -1},
-    {"sp", 1, {DICTIONARY_SYNONYM}, 4811},
-    {"št", 1, {DICTIONARY_NUMBER}, 4803},
+    {"stevilke", 1, {DICTIONARY_NUMBER}, 4814},
     {"številke", 1, {DICTIONARY_NUMBER}, -1},
     {"j", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"levo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"dm drogeriemarkt", 1, {DICTIONARY_CHAIN}, 4805},
+    {"sp", 1, {DICTIONARY_SYNONYM}, 4822},
     {"srednje", 1, {DICTIONARY_SYNONYM}, -1},
     {"vzhod", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"p.p", 1, {DICTIONARY_POST_OFFICE}, 4818},
     {"s", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"med", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"postni predal", 1, {DICTIONARY_POST_OFFICE}, 4818},
+    {"pp", 1, {DICTIONARY_POST_OFFICE}, 4818},
+    {"zg", 1, {DICTIONARY_SYNONYM}, 4834},
+    {"c", 1, {DICTIONARY_STREET_TYPE}, 4820},
     {"prav", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"kleti", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
     {"nadstropje", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"p p", 1, {DICTIONARY_POST_OFFICE}, 4807},
     {"vhod", 1, {DICTIONARY_ENTRANCE}, -1},
     {"jug", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"in", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"c", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"brez st", 1, {DICTIONARY_NO_NUMBER}, 4802},
-    {"dm drogeriemarkt", 1, {DICTIONARY_CHAIN}, 4794},
-    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4805},
+    {"zg", 1, {DICTIONARY_SYNONYM}, 4833},
     {"vogalu", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"v", 1, {DICTIONARY_SYNONYM}, 4818},
-    {"brez stevilke", 1, {DICTIONARY_NO_NUMBER}, 4802},
     {"v", 3, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
+    {"v", 1, {DICTIONARY_SYNONYM}, 4831},
+    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4808},
     {"zgornja", 1, {DICTIONARY_SYNONYM}, -1},
     {"sveti", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"okoli tukaj", 1, {DICTIONARY_NEAR}, -1},
-    {"postni predal", 1, {DICTIONARY_POST_OFFICE}, 4807},
     {"velike", 1, {DICTIONARY_SYNONYM}, -1},
-    {"v blizini tukaj", 1, {DICTIONARY_NEAR}, 4801},
-    {"pp", 1, {DICTIONARY_POST_OFFICE}, 4807},
-    {"c", 1, {DICTIONARY_STREET_TYPE}, 4809},
-    {"v", 1, {DICTIONARY_SYNONYM}, 4817},
-    {"br", 1, {DICTIONARY_PERSONAL_TITLE}, 4804},
-    {"st", 1, {DICTIONARY_NUMBER}, 4803},
-    {"sr", 1, {DICTIONARY_SYNONYM}, 4815},
+    {"v blizini", 1, {DICTIONARY_NEAR}, 4811},
+    {"stopnisce", 1, {DICTIONARY_STAIRCASE}, 4819},
+    {"spodnja", 1, {DICTIONARY_SYNONYM}, -1},
+    {"brez stevilke", 1, {DICTIONARY_NO_NUMBER}, 4813},
+    {"levo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"p p", 1, {DICTIONARY_POST_OFFICE}, 4818},
     {"bratov", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"v bližini", 1, {DICTIONARY_NEAR}, -1},
-    {"v", 1, {DICTIONARY_SYNONYM}, 4820},
-    {"stevilke", 1, {DICTIONARY_NUMBER}, 4803},
+    {"pritlicje", 1, {DICTIONARY_LEVEL_STANDALONE}, 4810},
+    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4809},
     {"дом", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"generala", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"bul", 1, {DICTIONARY_STREET_TYPE}, 4850},
+    {"podrum", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
     {"sever", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"restoran", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"postanski fah", 1, {DICTIONARY_POST_OFFICE}, 4845},
-    {"ул", 1, {DICTIONARY_STREET_TYPE}, 4851},
-    {"апт", 1, {DICTIONARY_UNIT_NUMBERED}, 4853},
+    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4853},
+    {"ап", 1, {DICTIONARY_UNIT_NUMBERED}, 4864},
     {"ресторан", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4865},
     {"и", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_CROSS_STREET}, -1},
-    {"skola", 1, {DICTIONARY_PLACE_NAME}, 4843},
+    {"pf", 1, {DICTIONARY_POST_OFFICE}, 4856},
+    {"улаз", 1, {DICTIONARY_ENTRANCE}, -1},
     {"трг", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"банка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"vinograd", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -82203,62 +82255,61 @@ address_expansion_rule_t expansion_rules[] = {
     {"пут", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"prizemlje", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"с", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"pošt pregradak", 1, {DICTIONARY_POST_OFFICE}, 4847},
-    {"с", 1, {DICTIONARY_DIRECTIONAL}, 4829},
-    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4854},
+    {"crkva", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4849},
     {"etaža", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"poštanski fah", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"између", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4865},
+    {"ет", 1, {DICTIONARY_LEVEL_NUMBERED}, 4844},
+    {"skola", 1, {DICTIONARY_PLACE_NAME}, 4854},
     {"светог", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"улаз", 1, {DICTIONARY_ENTRANCE}, -1},
+    {"бр", 1, {DICTIONARY_NUMBER}, 4846},
+    {"ул", 1, {DICTIONARY_STREET_TYPE}, 4862},
     {"поштански претинац", 1, {DICTIONARY_POST_OFFICE}, -1},
     {"soba", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"stan", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"j", 1, {DICTIONARY_DIRECTIONAL}, 4839},
+    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4851},
     {"подрум", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
-    {"з", 1, {DICTIONARY_DIRECTIONAL}, 4831},
-    {"п ф", 1, {DICTIONARY_POST_OFFICE}, 4844},
+    {"p.f", 1, {DICTIONARY_POST_OFFICE}, 4856},
+    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4841},
+    {"бул", 1, {DICTIONARY_STREET_TYPE}, 4860},
     {"на", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"ет", 1, {DICTIONARY_LEVEL_NUMBERED}, 4833},
-    {"p.f", 1, {DICTIONARY_POST_OFFICE}, 4845},
+    {"obilaznica", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"parter", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"ј", 1, {DICTIONARY_DIRECTIONAL}, 4827},
+    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4863},
     {"број", 1, {DICTIONARY_NUMBER}, -1},
     {"кат", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"стан", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"postanski pregradak", 1, {DICTIONARY_POST_OFFICE}, 4847},
+    {"stan", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"поштански преградак", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4838},
     {"црква", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {" post pretinac", 1, {DICTIONARY_POST_OFFICE}, 4846},
-    {"пошт фах", 1, {DICTIONARY_POST_OFFICE}, 4844},
     {"stepenište", 1, {DICTIONARY_STAIRCASE}, -1},
-    {"j", 1, {DICTIONARY_DIRECTIONAL}, 4828},
+    {" post pretinac", 1, {DICTIONARY_POST_OFFICE}, 4857},
     {"поштански фах", 1, {DICTIONARY_POST_OFFICE}, -1},
     {"svetor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"dom", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"stepeniste", 1, {DICTIONARY_STAIRCASE}, 4848},
-    {"crkva", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"др", 1, {DICTIONARY_PERSONAL_TITLE}, 4848},
     {"z", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4830},
+    {"pošt pregradak", 1, {DICTIONARY_POST_OFFICE}, 4858},
+    {"пф", 1, {DICTIONARY_POST_OFFICE}, 4855},
+    {"bul", 1, {DICTIONARY_STREET_TYPE}, 4861},
     {"ulica", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"улица", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"post pregradak", 1, {DICTIONARY_POST_OFFICE}, 4858},
     {"магистрала", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, -1},
-    {"post pregradak", 1, {DICTIONARY_POST_OFFICE}, 4847},
+    {"desno", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"bulevar", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4843},
+    {"postanski pregradak", 1, {DICTIONARY_POST_OFFICE}, 4858},
     {"škola", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"доктор", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sv", 1, {DICTIONARY_PERSONAL_TITLE}, 4842},
-    {"p f", 1, {DICTIONARY_POST_OFFICE}, 4845},
-    {"izmedu", 1, {DICTIONARY_CROSS_STREET}, 4824},
-    {"desno", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"апт", 1, {DICTIONARY_UNIT_NUMBERED}, 4864},
+    {"pošt pretinac", 1, {DICTIONARY_POST_OFFICE}, 4857},
     {"спрат", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"виноград", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"pošt pretinac", 1, {DICTIONARY_POST_OFFICE}, 4846},
     {"kancelarija", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"исток", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"sprat", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"запад", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"војводе", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"pf", 1, {DICTIONARY_POST_OFFICE}, 4845},
     {"север", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"ј", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"степениште", 1, {DICTIONARY_STAIRCASE}, -1},
@@ -82267,795 +82318,796 @@ address_expansion_rule_t expansion_rules[] = {
     {"булевар", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"угао", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"poštanski pretinac", 1, {DICTIONARY_POST_OFFICE}, -1},
+    {"i", 1, {DICTIONARY_DIRECTIONAL}, 4837},
     {"doktor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4832},
     {"vojvode", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"краља", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"kneza", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"апартман", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"канцеларија", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"бр", 1, {DICTIONARY_NUMBER}, 4835},
     {"школа", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"apartman", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"партер", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"п.ф", 1, {DICTIONARY_POST_OFFICE}, 4844},
+    {"з", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"poštanski fah", 1, {DICTIONARY_POST_OFFICE}, -1},
     {"kat", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"j", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"bulevardi", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ugao", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"ј", 1, {DICTIONARY_DIRECTIONAL}, 4838},
     {"levo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"ul", 1, {DICTIONARY_STREET_TYPE}, 4852},
     {"лево", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"s", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"ап", 1, {DICTIONARY_UNIT_NUMBERED}, 4853},
     {"обилазница", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"етажа", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"obilaznica", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"пф", 1, {DICTIONARY_POST_OFFICE}, 4844},
-    {"br", 1, {DICTIONARY_NUMBER}, 4836},
+    {"п ф", 1, {DICTIONARY_POST_OFFICE}, 4855},
     {"prilaz", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"генерала", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"з", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"партер", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"jug", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"broj", 1, {DICTIONARY_NUMBER}, -1},
-    {"gen", 1, {DICTIONARY_PERSONAL_TITLE}, 4840},
     {"на углу", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"pošt fah", 1, {DICTIONARY_POST_OFFICE}, 4845},
+    {"п.ф", 1, {DICTIONARY_POST_OFFICE}, 4855},
+    {"pošt fah", 1, {DICTIONARY_POST_OFFICE}, 4856},
+    {"izmedu", 1, {DICTIONARY_CROSS_STREET}, 4835},
+    {"et", 1, {DICTIONARY_LEVEL_NUMBERED}, 4845},
     {"приземље", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"zapad", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"др", 1, {DICTIONARY_PERSONAL_TITLE}, 4837},
-    {"et", 1, {DICTIONARY_LEVEL_NUMBERED}, 4834},
-    {"св", 1, {DICTIONARY_PERSONAL_TITLE}, 4841},
+    {"св", 1, {DICTIONARY_PERSONAL_TITLE}, 4852},
+    {"ген", 1, {DICTIONARY_PERSONAL_TITLE}, 4850},
+    {"stepeniste", 1, {DICTIONARY_STAIRCASE}, 4859},
+    {"banka", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"и", 1, {DICTIONARY_DIRECTIONAL}, 4836},
     {"istok", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"podrum", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
-    {"и", 1, {DICTIONARY_DIRECTIONAL}, 4825},
+    {"generala", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"put", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"прилаз", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"vladike", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"na uglu", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"poštanski pregradak", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"бул", 1, {DICTIONARY_STREET_TYPE}, 4849},
-    {"postanski pretinac", 1, {DICTIONARY_POST_OFFICE}, 4846},
+    {"с", 1, {DICTIONARY_DIRECTIONAL}, 4840},
+    {"p f", 1, {DICTIONARY_POST_OFFICE}, 4856},
+    {"postanski fah", 1, {DICTIONARY_POST_OFFICE}, 4856},
+    {"пошт фах", 1, {DICTIONARY_POST_OFFICE}, 4855},
     {"trg", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"десно", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"улица", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"postanski pretinac", 1, {DICTIONARY_POST_OFFICE}, 4857},
     {"владике", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"i", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_CROSS_STREET}, -1},
-    {"banka", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"виноград", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"кнеза", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"ulaz", 1, {DICTIONARY_ENTRANCE}, -1},
+    {"између", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"br", 1, {DICTIONARY_NUMBER}, 4847},
     {"kralja", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"između", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4854},
     {"magistrala", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, -1},
-    {"ген", 1, {DICTIONARY_PERSONAL_TITLE}, 4839},
-    {"i", 1, {DICTIONARY_DIRECTIONAL}, 4826},
-    {"t.h", 1, {DICTIONARY_UNIT_DIRECTION}, 4921},
-    {"uv", 1, {DICTIONARY_STAIRCASE}, 4906},
-    {"soedra", 1, {DICTIONARY_DIRECTIONAL}, 4874},
+    {"з", 1, {DICTIONARY_DIRECTIONAL}, 4842},
+    {"vaest", 1, {DICTIONARY_DIRECTIONAL}, 4886},
+    {"st.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 4874},
     {"västra", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"motliggande", 1, {DICTIONARY_STOPWORD}, -1},
-    {"till hoger", 1, {DICTIONARY_UNIT_DIRECTION}, 4921},
+    {"lgnr", 1, {DICTIONARY_UNIT_NUMBERED}, 4936},
     {"våningen", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"vaningen", 1, {DICTIONARY_LEVEL_NUMBERED}, 4884},
-    {"vaan", 1, {DICTIONARY_LEVEL_NUMBERED}, 4883},
-    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4873},
+    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4911},
+    {"tr upp", 1, {DICTIONARY_LEVEL_NUMBERED}, 4890},
+    {"s:a", 1, {DICTIONARY_DIRECTIONAL}, 4885},
     {"l", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"box", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"postlaada", 1, {DICTIONARY_POST_OFFICE}, 4903},
-    {"st", 1, {DICTIONARY_PERSONAL_TITLE}, 4901},
-    {"bst", 1, {DICTIONARY_UNIT_NUMBERED}, 4923},
-    {"ab publ", 1, {DICTIONARY_COMPANY_TYPE}, 4856},
+    {"vaan", 1, {DICTIONARY_LEVEL_NUMBERED}, 4894},
+    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4884},
+    {"u.h", 1, {DICTIONARY_STAIRCASE}, 4916},
+    {"graend", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 4870},
     {"ö", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"söd", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"framfoer", 1, {DICTIONARY_STOPWORD}, 4909},
-    {"bostad", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"omkring har", 1, {DICTIONARY_NEAR}, 4907},
+    {"uppgaang", 1, {DICTIONARY_STAIRCASE}, 4915},
+    {"naermast", 1, {DICTIONARY_STOPWORD}, 4922},
+    {"lgh", 1, {DICTIONARY_UNIT_NUMBERED}, 4935},
+    {"i hornet av", 1, {DICTIONARY_CROSS_STREET}, 4878},
     {"aat", 1, {DICTIONARY_STOPWORD}, -1},
-    {"st", 1, {DICTIONARY_SYNONYM}, 4918},
-    {"vaest", 1, {DICTIONARY_DIRECTIONAL}, 4875},
-    {"för", 1, {DICTIONARY_STOPWORD}, -1},
-    {"u h", 1, {DICTIONARY_STAIRCASE}, 4905},
+    {"bottenvån", 1, {DICTIONARY_LEVEL_STANDALONE}, 4896},
+    {"st", 1, {DICTIONARY_SYNONYM}, 4929},
+    {"th", 1, {DICTIONARY_UNIT_DIRECTION}, 4932},
     {"sankt", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"stig", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
-    {"ab ( publ )", 1, {DICTIONARY_COMPANY_TYPE}, 4856},
-    {"vaan", 1, {DICTIONARY_LEVEL_NUMBERED}, 4884},
+    {"uppgaang hoger", 1, {DICTIONARY_STAIRCASE}, 4916},
+    {"lägenhetsnummer", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"vån", 1, {DICTIONARY_LEVEL_NUMBERED}, 4895},
+    {"t.v", 1, {DICTIONARY_UNIT_DIRECTION}, 4933},
     {"vägen", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
-    {"no", 1, {DICTIONARY_NUMBER}, 4899},
+    {"uppgang hoger", 1, {DICTIONARY_STAIRCASE}, 4916},
+    {"o", 1, {DICTIONARY_DIRECTIONAL}, 4882},
     {"åt", 1, {DICTIONARY_STOPWORD}, -1},
-    {"oest", 1, {DICTIONARY_DIRECTIONAL}, 4871},
+    {"o", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"gränden", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, -1},
-    {"ingaang", 1, {DICTIONARY_ENTRANCE}, 4878},
-    {"uppgang", 1, {DICTIONARY_STAIRCASE}, 4904},
-    {"på", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
-    {"bottenvåning", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"vån", 1, {DICTIONARY_LEVEL_NUMBERED}, 4884},
+    {"och", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"vanster", 1, {DICTIONARY_UNIT_DIRECTION}, 4931},
+    {"hoger", 1, {DICTIONARY_UNIT_DIRECTION}, 4930},
+    {"ostra", 1, {DICTIONARY_DIRECTIONAL}, 4883},
+    {"hb", 1, {DICTIONARY_COMPANY_TYPE}, 4868},
+    {"vaan", 1, {DICTIONARY_LEVEL_NUMBERED}, 4895},
+    {"källare", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"före", 1, {DICTIONARY_STOPWORD}, -1},
+    {"lg", 1, {DICTIONARY_UNIT_NUMBERED}, 4935},
     {"uppgång höger", 1, {DICTIONARY_STAIRCASE}, -1},
-    {"vanster", 1, {DICTIONARY_UNIT_DIRECTION}, 4920},
+    {"in", 1, {DICTIONARY_STOPWORD}, -1},
     {"lång", 1, {DICTIONARY_SYNONYM}, -1},
     {"våning", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"i naerheten", 1, {DICTIONARY_STOPWORD}, 4890},
     {"vindsvåningen", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"i hörnet av", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"s:a", 1, {DICTIONARY_DIRECTIONAL}, 4874},
-    {"källare", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"g", 1, {DICTIONARY_STREET_TYPE}, 4861},
-    {"u.v", 1, {DICTIONARY_STAIRCASE}, 4906},
+    {"på", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
+    {"bottenvåning", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
+    {"lagenhet", 1, {DICTIONARY_UNIT_NUMBERED}, 4935},
+    {"laegenhetsnummer", 1, {DICTIONARY_UNIT_NUMBERED}, 4936},
+    {"nara till har", 1, {DICTIONARY_NEAR}, 4905},
+    {"skt", 1, {DICTIONARY_PERSONAL_TITLE}, 4912},
+    {"postlada", 1, {DICTIONARY_POST_OFFICE}, 4914},
     {"emellan", 1, {DICTIONARY_STOPWORD}, -1},
-    {"omkring har", 1, {DICTIONARY_NEAR}, 4896},
-    {"skt", 1, {DICTIONARY_PERSONAL_TITLE}, 4901},
+    {"lgh nr", 1, {DICTIONARY_UNIT_NUMBERED}, 4936},
+    {"bottenvaaning", 1, {DICTIONARY_LEVEL_STANDALONE}, 4896},
     {"&", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"s:ta", 1, {DICTIONARY_PERSONAL_TITLE}, 4902},
-    {"lgnr", 1, {DICTIONARY_UNIT_NUMBERED}, 4925},
-    {"paa andra sidan", 1, {DICTIONARY_STOPWORD}, 4913},
+    {"vindsvaningen", 1, {DICTIONARY_LEVEL_STANDALONE}, 4899},
+    {"ost", 1, {DICTIONARY_DIRECTIONAL}, 4882},
+    {"s:t", 1, {DICTIONARY_PERSONAL_TITLE}, 4912},
+    {"entreplan", 1, {DICTIONARY_LEVEL_STANDALONE}, 4897},
+    {"t.h", 1, {DICTIONARY_UNIT_DIRECTION}, 4932},
     {"intill", 1, {DICTIONARY_STOPWORD}, -1},
-    {"publiktaktiebolag", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"från", 1, {DICTIONARY_STOPWORD}, -1},
-    {"ö:a", 1, {DICTIONARY_DIRECTIONAL}, 4872},
     {"bakom", 1, {DICTIONARY_STOPWORD}, -1},
-    {"uppgaang", 1, {DICTIONARY_STAIRCASE}, 4904},
-    {"allé", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"sta", 1, {DICTIONARY_PERSONAL_TITLE}, 4902},
-    {"hoger", 1, {DICTIONARY_UNIT_DIRECTION}, 4919},
-    {"i narheten av", 1, {DICTIONARY_NEAR}, 4891},
-    {"v:a", 1, {DICTIONARY_DIRECTIONAL}, 4876},
+    {"foer", 1, {DICTIONARY_STOPWORD}, 4918},
+    {"uv", 1, {DICTIONARY_STAIRCASE}, 4917},
+    {"lghnr", 1, {DICTIONARY_UNIT_NUMBERED}, 4936},
+    {"hörnet av", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"s:ta", 1, {DICTIONARY_PERSONAL_TITLE}, 4913},
+    {"soedra", 1, {DICTIONARY_DIRECTIONAL}, 4885},
     {"nära till här", 1, {DICTIONARY_NEAR}, -1},
-    {"#", 1, {DICTIONARY_NUMBER}, 4899},
-    {"lgh nr", 1, {DICTIONARY_UNIT_NUMBERED}, 4925},
+    {"tv", 1, {DICTIONARY_UNIT_DIRECTION}, 4933},
+    {"runt har", 1, {DICTIONARY_NEAR}, 4909},
     {"södra", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"#", 1, {DICTIONARY_NUMBER}, 4910},
     {"i närheten av mig", 1, {DICTIONARY_NEAR}, -1},
-    {"g.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 4861},
+    {"oest", 1, {DICTIONARY_DIRECTIONAL}, 4882},
     {"k", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"gamla", 1, {DICTIONARY_SYNONYM}, -1},
-    {"foere", 1, {DICTIONARY_STOPWORD}, 4910},
-    {"stora", 1, {DICTIONARY_SYNONYM}, -1},
-    {"nara har", 1, {DICTIONARY_NEAR}, 4893},
+    {"tr", 1, {DICTIONARY_LEVEL_NUMBERED}, 4891},
+    {"vaning", 1, {DICTIONARY_LEVEL_NUMBERED}, 4894},
+    {"foere", 1, {DICTIONARY_STOPWORD}, 4921},
+    {"№", 1, {DICTIONARY_NUMBER}, 4910},
+    {"ab ( publ )", 1, {DICTIONARY_COMPANY_TYPE}, 4867},
+    {"uppgang", 1, {DICTIONARY_STAIRCASE}, 4915},
     {"trappor", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"foer", 1, {DICTIONARY_STOPWORD}, 4907},
     {"kommanditbolag", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"laegenhet", 1, {DICTIONARY_UNIT_NUMBERED}, 4924},
-    {"vastra", 1, {DICTIONARY_DIRECTIONAL}, 4876},
-    {"pl", 1, {DICTIONARY_POST_OFFICE}, 4903},
-    {"hörnet av", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"pl.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 4862},
-    {"nara till har", 1, {DICTIONARY_NEAR}, 4894},
-    {"vindsvaaningen", 1, {DICTIONARY_LEVEL_STANDALONE}, 4888},
-    {"vaaning", 1, {DICTIONARY_LEVEL_NUMBERED}, 4883},
-    {"u v", 1, {DICTIONARY_STAIRCASE}, 4906},
+    {"vaaning", 1, {DICTIONARY_LEVEL_NUMBERED}, 4894},
+    {"lagenhetsnummer", 1, {DICTIONARY_UNIT_NUMBERED}, 4936},
+    {"vaaningen", 1, {DICTIONARY_LEVEL_NUMBERED}, 4895},
+    {"hornet av", 1, {DICTIONARY_CROSS_STREET}, 4877},
+    {"u h", 1, {DICTIONARY_STAIRCASE}, 4916},
+    {"soed", 1, {DICTIONARY_DIRECTIONAL}, 4884},
+    {"ab publ", 1, {DICTIONARY_COMPANY_TYPE}, 4867},
+    {"för", 1, {DICTIONARY_STOPWORD}, -1},
+    {"pl", 1, {DICTIONARY_STREET_TYPE}, 4873},
+    {"via", 1, {DICTIONARY_STOPWORD}, -1},
+    {"vast", 1, {DICTIONARY_DIRECTIONAL}, 4886},
     {"rum", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"tr upp", 1, {DICTIONARY_LEVEL_NUMBERED}, 4879},
+    {"sankta", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"lilla", 1, {DICTIONARY_SYNONYM}, -1},
-    {"bottenvaaning", 1, {DICTIONARY_LEVEL_STANDALONE}, 4885},
-    {"doktor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"g.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 4872},
     {"väst", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"t.v", 1, {DICTIONARY_UNIT_DIRECTION}, 4922},
-    {"vån", 1, {DICTIONARY_LEVEL_NUMBERED}, 4883},
+    {"vag", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 4875},
+    {"paa andra sidan", 1, {DICTIONARY_STOPWORD}, 4924},
+    {"uh", 1, {DICTIONARY_STAIRCASE}, 4916},
     {"norra", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"uh", 1, {DICTIONARY_STAIRCASE}, 4905},
-    {"hornet av", 1, {DICTIONARY_CROSS_STREET}, 4866},
+    {"bostad", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"graenden", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 4871},
     {"n", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"till", 1, {DICTIONARY_STOPWORD}, -1},
     {"entréplan", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"mell", 1, {DICTIONARY_CROSS_STREET}, 4868},
-    {"vänster", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"sankta", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"uppgang hoger", 1, {DICTIONARY_STAIRCASE}, 4905},
-    {"i narheten av mig", 1, {DICTIONARY_NEAR}, 4889},
-    {"alle", 1, {DICTIONARY_STREET_TYPE}, 4914},
-    {"n", 1, {DICTIONARY_DIRECTIONAL}, 4869},
-    {"ö", 1, {DICTIONARY_DIRECTIONAL}, 4871},
+    {"till vanster", 1, {DICTIONARY_UNIT_DIRECTION}, 4933},
+    {"g:la", 1, {DICTIONARY_SYNONYM}, 4926},
+    {"sod", 1, {DICTIONARY_DIRECTIONAL}, 4884},
+    {"postlåda", 1, {DICTIONARY_POST_OFFICE}, -1},
+    {"tr", 1, {DICTIONARY_LEVEL_NUMBERED}, 4893},
+    {"vastra", 1, {DICTIONARY_DIRECTIONAL}, 4887},
+    {"vaestra", 1, {DICTIONARY_DIRECTIONAL}, 4887},
+    {"st", 1, {DICTIONARY_PERSONAL_TITLE}, 4912},
     {"väg", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
-    {"st.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 4863},
-    {"sodra", 1, {DICTIONARY_DIRECTIONAL}, 4874},
-    {"kallare", 1, {DICTIONARY_LEVEL_STANDALONE}, 4887},
-    {"lgh", 1, {DICTIONARY_UNIT_NUMBERED}, 4924},
-    {"uppgaang vanster", 1, {DICTIONARY_STAIRCASE}, 4906},
-    {"vaaningen", 1, {DICTIONARY_LEVEL_NUMBERED}, 4884},
-    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4875},
-    {"lägenhetsnummer", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"nara", 1, {DICTIONARY_NEAR}, 4892},
-    {"paa", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, 4897},
-    {"bottenvån", 1, {DICTIONARY_LEVEL_STANDALONE}, 4885},
-    {"i hornet av", 1, {DICTIONARY_CROSS_STREET}, 4867},
-    {"oestra", 1, {DICTIONARY_DIRECTIONAL}, 4872},
+    {"till vänster", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"vaningen", 1, {DICTIONARY_LEVEL_NUMBERED}, 4895},
+    {"ingaang", 1, {DICTIONARY_ENTRANCE}, 4889},
+    {"v", 1, {DICTIONARY_STREET_TYPE}, 4875},
+    {"nara har", 1, {DICTIONARY_NEAR}, 4904},
+    {"av", 1, {DICTIONARY_STOPWORD}, -1},
+    {"doktor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"ingang", 1, {DICTIONARY_ENTRANCE}, 4889},
+    {"tr upp", 1, {DICTIONARY_LEVEL_NUMBERED}, 4892},
     {"i närheten av", 1, {DICTIONARY_NEAR}, -1},
-    {"dr", 1, {DICTIONARY_PERSONAL_TITLE}, 4900},
+    {"pl", 1, {DICTIONARY_POST_OFFICE}, 4914},
     {"till höger", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"trappa", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"på andra sidan", 1, {DICTIONARY_STOPWORD}, -1},
-    {"höger", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"vindsvaningen", 1, {DICTIONARY_LEVEL_STANDALONE}, 4888},
-    {"pl", 1, {DICTIONARY_STREET_TYPE}, 4862},
-    {"runt har", 1, {DICTIONARY_NEAR}, 4898},
+    {"ö:a", 1, {DICTIONARY_DIRECTIONAL}, 4883},
+    {"entre", 1, {DICTIONARY_ENTRANCE}, 4888},
     {"aktiebolag", 1, {DICTIONARY_COMPANY_TYPE}, -1},
-    {"ost", 1, {DICTIONARY_DIRECTIONAL}, 4871},
-    {"lg nr", 1, {DICTIONARY_UNIT_NUMBERED}, 4925},
-    {"№", 1, {DICTIONARY_NUMBER}, 4899},
-    {"naermast", 1, {DICTIONARY_STOPWORD}, 4911},
-    {"vaestra", 1, {DICTIONARY_DIRECTIONAL}, 4876},
-    {"l", 1, {DICTIONARY_SYNONYM}, 4917},
-    {"vaeg", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 4864},
-    {"postlåda", 1, {DICTIONARY_POST_OFFICE}, -1},
+    {"uppgång", 1, {DICTIONARY_STAIRCASE}, -1},
+    {"paa", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, 4908},
+    {"sodra", 1, {DICTIONARY_DIRECTIONAL}, 4885},
+    {"i naerheten", 1, {DICTIONARY_STOPWORD}, 4901},
+    {"höger", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"nr", 1, {DICTIONARY_NUMBER}, 4910},
+    {"oever", 1, {DICTIONARY_STOPWORD}, 4923},
+    {"g", 1, {DICTIONARY_STREET_TYPE}, 4872},
     {"gata", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
+    {"i narheten av", 1, {DICTIONARY_NEAR}, 4902},
     {"liden", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},
-    {"närmast", 1, {DICTIONARY_STOPWORD}, -1},
-    {"o", 1, {DICTIONARY_DIRECTIONAL}, 4871},
+    {"vaegen", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 4876},
     {"under", 1, {DICTIONARY_STOPWORD}, -1},
-    {"uppgang vanster", 1, {DICTIONARY_STAIRCASE}, 4906},
-    {"v", 1, {DICTIONARY_STREET_TYPE}, 4864},
-    {"v.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 4864},
-    {"s:t", 1, {DICTIONARY_PERSONAL_TITLE}, 4901},
-    {"laang", 1, {DICTIONARY_SYNONYM}, 4916},
-    {"och", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"närmast", 1, {DICTIONARY_STOPWORD}, -1},
+    {"v:a", 1, {DICTIONARY_DIRECTIONAL}, 4887},
+    {"till hoger", 1, {DICTIONARY_UNIT_DIRECTION}, 4932},
+    {"vagen", 1, {DICTIONARY_STREET_TYPE}, 4876},
     {"s", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"ostra", 1, {DICTIONARY_DIRECTIONAL}, 4872},
-    {"u.h", 1, {DICTIONARY_STAIRCASE}, 4905},
     {"nära mig", 1, {DICTIONARY_NEAR}, -1},
     {"nära här", 1, {DICTIONARY_NEAR}, -1},
-    {"lagenhet", 1, {DICTIONARY_UNIT_NUMBERED}, 4924},
-    {"nr", 1, {DICTIONARY_NUMBER}, 4899},
-    {"graend", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 4859},
+    {"fraan", 1, {DICTIONARY_STOPWORD}, 4919},
+    {"mell", 1, {DICTIONARY_CROSS_STREET}, 4879},
+    {"allé", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"plan", 3, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_LEVEL_NUMBERED, DICTIONARY_STREET_TYPE}, -1},
-    {"n:a", 1, {DICTIONARY_DIRECTIONAL}, 4870},
     {"entré", 1, {DICTIONARY_ENTRANCE}, -1},
-    {"th", 1, {DICTIONARY_UNIT_DIRECTION}, 4921},
-    {"ab", 1, {DICTIONARY_COMPANY_TYPE}, 4855},
     {"nära", 1, {DICTIONARY_NEAR}, -1},
-    {"uppgaang hoger", 1, {DICTIONARY_STAIRCASE}, 4905},
-    {"nara mig", 1, {DICTIONARY_NEAR}, 4895},
-    {"laegenhetsnummer", 1, {DICTIONARY_UNIT_NUMBERED}, 4925},
+    {"skta", 1, {DICTIONARY_PERSONAL_TITLE}, 4913},
+    {"pl.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 4873},
     {"trappor upp", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"lägenhet", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"sod", 1, {DICTIONARY_DIRECTIONAL}, 4873},
-    {"av", 1, {DICTIONARY_STOPWORD}, -1},
-    {"till vanster", 1, {DICTIONARY_UNIT_DIRECTION}, 4922},
-    {"ingang", 1, {DICTIONARY_ENTRANCE}, 4878},
+    {"publiktaktiebolag", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"no", 1, {DICTIONARY_NUMBER}, 4910},
+    {"alle", 1, {DICTIONARY_STREET_TYPE}, 4925},
+    {"laegenhet", 1, {DICTIONARY_UNIT_NUMBERED}, 4935},
     {"bak", 1, {DICTIONARY_STOPWORD}, -1},
     {"trappa upp", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"handelsbolag", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"nara mig", 1, {DICTIONARY_NEAR}, 4906},
     {"g", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"via", 1, {DICTIONARY_STOPWORD}, -1},
-    {"skta", 1, {DICTIONARY_PERSONAL_TITLE}, 4902},
-    {"vaning", 1, {DICTIONARY_LEVEL_NUMBERED}, 4883},
-    {"lagenhetsnummer", 1, {DICTIONARY_UNIT_NUMBERED}, 4925},
-    {"vaegen", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 4865},
-    {"bv", 1, {DICTIONARY_LEVEL_STANDALONE}, 4885},
+    {"kb", 1, {DICTIONARY_COMPANY_TYPE}, 4869},
+    {"framför", 1, {DICTIONARY_STOPWORD}, -1},
+    {"nara", 1, {DICTIONARY_NEAR}, 4903},
     {"över", 1, {DICTIONARY_STOPWORD}, -1},
     {"öst", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"vag", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 4864},
-    {"g:la", 1, {DICTIONARY_SYNONYM}, 4915},
+    {"l", 1, {DICTIONARY_SYNONYM}, 4928},
+    {"v.", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 4875},
+    {"vån", 1, {DICTIONARY_LEVEL_NUMBERED}, 4894},
     {"v", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"laang", 1, {DICTIONARY_SYNONYM}, 4927},
     {"stigen", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
     {"hus", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"omkring här", 1, {DICTIONARY_NEAR}, -1},
-    {"runt här", 1, {DICTIONARY_NEAR}, -1},
+    {"oestra", 1, {DICTIONARY_DIRECTIONAL}, 4883},
     {"torg", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},
-    {"postlada", 1, {DICTIONARY_POST_OFFICE}, 4903},
-    {"vast", 1, {DICTIONARY_DIRECTIONAL}, 4875},
-    {"soed", 1, {DICTIONARY_DIRECTIONAL}, 4873},
+    {"uppgang vanster", 1, {DICTIONARY_STAIRCASE}, 4917},
+    {"vänster", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"st", 1, {DICTIONARY_STREET_TYPE}, 4874},
+    {"o:a", 1, {DICTIONARY_DIRECTIONAL}, 4883},
     {"ingång", 1, {DICTIONARY_ENTRANCE}, -1},
     {"i närheten", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
-    {"tr", 1, {DICTIONARY_LEVEL_NUMBERED}, 4880},
     {"mellan", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
-    {"entreplan", 1, {DICTIONARY_LEVEL_STANDALONE}, 4886},
-    {"o", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"vagen", 1, {DICTIONARY_STREET_TYPE}, 4865},
+    {"bst", 1, {DICTIONARY_UNIT_NUMBERED}, 4934},
+    {"stora", 1, {DICTIONARY_SYNONYM}, -1},
     {"framme", 1, {DICTIONARY_STOPWORD}, -1},
+    {"postlaada", 1, {DICTIONARY_POST_OFFICE}, 4914},
     {"plats", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
-    {"platsen", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
-    {"kb", 1, {DICTIONARY_COMPANY_TYPE}, 4858},
-    {"tr upp", 1, {DICTIONARY_LEVEL_NUMBERED}, 4881},
+    {"framfoer", 1, {DICTIONARY_STOPWORD}, 4920},
+    {"bv", 1, {DICTIONARY_LEVEL_STANDALONE}, 4896},
+    {"sta", 1, {DICTIONARY_PERSONAL_TITLE}, 4913},
     {"östra", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"st", 1, {DICTIONARY_STREET_TYPE}, 4863},
-    {"in", 1, {DICTIONARY_STOPWORD}, -1},
-    {"hb", 1, {DICTIONARY_COMPANY_TYPE}, 4857},
+    {"u.v", 1, {DICTIONARY_STAIRCASE}, 4917},
+    {"i narheten", 1, {DICTIONARY_NEAR}, 4901},
     {"i", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
-    {"i narheten", 1, {DICTIONARY_NEAR}, 4890},
+    {"vaeg", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 4875},
     {"vinds", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"till vänster", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"tr", 1, {DICTIONARY_LEVEL_NUMBERED}, 4882},
-    {"tv", 1, {DICTIONARY_UNIT_DIRECTION}, 4922},
-    {"uppgång", 1, {DICTIONARY_STAIRCASE}, -1},
+    {"i narheten av mig", 1, {DICTIONARY_NEAR}, 4900},
+    {"vindsvaaningen", 1, {DICTIONARY_LEVEL_STANDALONE}, 4899},
+    {"n", 1, {DICTIONARY_DIRECTIONAL}, 4880},
+    {"ö", 1, {DICTIONARY_DIRECTIONAL}, 4882},
     {"gränd", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},
-    {"fraan", 1, {DICTIONARY_STOPWORD}, 4908},
-    {"norr", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"ab", 1, {DICTIONARY_COMPANY_TYPE}, 4866},
+    {"kallare", 1, {DICTIONARY_LEVEL_STANDALONE}, 4898},
+    {"platsen", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
+    {"v", 1, {DICTIONARY_DIRECTIONAL}, 4886},
     {"nummer", 1, {DICTIONARY_NUMBER}, -1},
-    {"entre", 1, {DICTIONARY_ENTRANCE}, 4877},
-    {"framför", 1, {DICTIONARY_STOPWORD}, -1},
-    {"lghnr", 1, {DICTIONARY_UNIT_NUMBERED}, 4925},
-    {"lg", 1, {DICTIONARY_UNIT_NUMBERED}, 4924},
+    {"u v", 1, {DICTIONARY_STAIRCASE}, 4917},
+    {"n:a", 1, {DICTIONARY_DIRECTIONAL}, 4881},
+    {"uppgaang vanster", 1, {DICTIONARY_STAIRCASE}, 4917},
+    {"lg nr", 1, {DICTIONARY_UNIT_NUMBERED}, 4936},
     {"gatan", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},
-    {"oever", 1, {DICTIONARY_STOPWORD}, 4912},
-    {"o:a", 1, {DICTIONARY_DIRECTIONAL}, 4872},
-    {"graenden", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 4860},
+    {"norr", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"runt här", 1, {DICTIONARY_NEAR}, -1},
     {"uppgång vänster", 1, {DICTIONARY_STAIRCASE}, -1},
-    {"வழி", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"vazhi", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"சாலை", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"salai", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ซอย", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ป.ต.ท.", 1, {DICTIONARY_CHAIN}, -1},
-    {"sxy tesbal", 1, {DICTIONARY_STREET_TYPE}, 4929},
-    {"thnn", 1, {DICTIONARY_STREET_TYPE}, 4930},
+    {"sxy", 1, {DICTIONARY_STREET_TYPE}, 4939},
+    {"ป.ต.ท", 1, {DICTIONARY_CHAIN}, 4937},
+    {"t̄hnn", 1, {DICTIONARY_STREET_TYPE}, 4941},
+    {"p.t.t", 1, {DICTIONARY_CHAIN}, 4938},
+    {"sxy tesbal", 1, {DICTIONARY_STREET_TYPE}, 4940},
+    {"sxy theṣ̄bāl", 1, {DICTIONARY_STREET_TYPE}, 4940},
     {"ptt", 1, {DICTIONARY_CHAIN}, -1},
+    {"thnn", 1, {DICTIONARY_STREET_TYPE}, 4941},
     {"thanon", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"ป ต ท", 1, {DICTIONARY_CHAIN}, 4937},
     {"soi", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"p.t.t", 1, {DICTIONARY_CHAIN}, 4927},
-    {"ป ต ท", 1, {DICTIONARY_CHAIN}, 4926},
     {"soi thetsaban", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"trxk", 1, {DICTIONARY_STREET_TYPE}, 4931},
-    {"t̄hnn", 1, {DICTIONARY_STREET_TYPE}, 4930},
-    {"ตรอก", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"p t t", 1, {DICTIONARY_CHAIN}, 4927},
+    {"p t t", 1, {DICTIONARY_CHAIN}, 4938},
+    {"trxk", 1, {DICTIONARY_STREET_TYPE}, 4942},
     {"ซอยเทศบาล", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"ปตท", 1, {DICTIONARY_CHAIN}, 4926},
+    {"ตรอก", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"ปตท", 1, {DICTIONARY_CHAIN}, 4937},
     {"ถนน", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ไฮเวย์", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"ป.ต.ท", 1, {DICTIONARY_CHAIN}, 4926},
-    {"sxy", 1, {DICTIONARY_STREET_TYPE}, 4928},
     {"ทางด่วน", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"trok", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"sxy theṣ̄bāl", 1, {DICTIONARY_STREET_TYPE}, 4929},
     {"caddesi", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"ilce", 1, {DICTIONARY_QUALIFIER}, 4947},
-    {"k", 1, {DICTIONARY_DIRECTIONAL}, 4938},
-    {"kosesinde", 1, {DICTIONARY_CROSS_STREET}, 4934},
-    {"bim", 1, {DICTIONARY_CHAIN}, -1},
+    {"nolu", 1, {DICTIONARY_NUMBER}, 4954},
+    {"mah", 1, {DICTIONARY_QUALIFIER}, 4960},
+    {"arasinda", 1, {DICTIONARY_CROSS_STREET}, 4943},
     {"hanım", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"cd", 1, {DICTIONARY_STREET_TYPE}, 4953},
-    {"bati", 1, {DICTIONARY_DIRECTIONAL}, 4935},
-    {"sk", 1, {DICTIONARY_STREET_TYPE}, 4956},
-    {"p.k", 1, {DICTIONARY_POST_OFFICE}, 4946},
-    {"giris", 1, {DICTIONARY_ENTRANCE}, 4939},
+    {"no:", 1, {DICTIONARY_NUMBER}, 4953},
+    {"k", 1, {DICTIONARY_DIRECTIONAL}, 4949},
+    {"no :", 1, {DICTIONARY_NUMBER}, 4953},
     {"doğu", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"ve", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"sokak", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"dogu", 1, {DICTIONARY_DIRECTIONAL}, 4936},
+    {"hanim", 1, {DICTIONARY_PERSONAL_TITLE}, 4955},
     {"cami", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"blv", 1, {DICTIONARY_STREET_TYPE}, 4951},
+    {"sk", 1, {DICTIONARY_STREET_TYPE}, 4967},
+    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4970},
+    {"zk", 1, {DICTIONARY_LEVEL_STANDALONE}, 4952},
+    {"sokagi", 1, {DICTIONARY_STREET_TYPE}, 4967},
+    {"numara", 1, {DICTIONARY_NUMBER}, -1},
     {"bulvar", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"sok", 1, {DICTIONARY_STREET_TYPE}, 4955},
     {"köyü", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"d", 1, {DICTIONARY_UNIT_NUMBERED}, 4960},
     {"sol", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"apt", 1, {DICTIONARY_UNIT_NUMBERED}, 4959},
+    {"cad", 1, {DICTIONARY_STREET_TYPE}, 4964},
     {"ofis", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"b", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"koyu", 1, {DICTIONARY_QUALIFIER}, 4948},
     {"daire", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"sok", 1, {DICTIONARY_STREET_TYPE}, 4956},
-    {"no", 1, {DICTIONARY_NUMBER}, 4942},
     {"k", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"cd", 1, {DICTIONARY_STREET_TYPE}, 4952},
     {"mimar", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"no :", 1, {DICTIONARY_NUMBER}, 4942},
-    {"b", 1, {DICTIONARY_DIRECTIONAL}, 4935},
-    {"mah", 1, {DICTIONARY_QUALIFIER}, 4950},
-    {"numara", 1, {DICTIONARY_NUMBER}, -1},
+    {"bim", 1, {DICTIONARY_CHAIN}, -1},
+    {"p.k", 1, {DICTIONARY_POST_OFFICE}, 4957},
+    {"sokak", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"mahalle", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"k", 1, {DICTIONARY_LEVEL_NUMBERED}, 4940},
-    {"cevreyolu", 1, {DICTIONARY_STREET_TYPE}, 4954},
+    {"kosesinde", 1, {DICTIONARY_CROSS_STREET}, 4945},
+    {"cevreyolu", 1, {DICTIONARY_STREET_TYPE}, 4965},
+    {"blv", 1, {DICTIONARY_STREET_TYPE}, 4962},
     {"çevre yolu", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"çevreyolu", 1, {DICTIONARY_STREET_TYPE}, 4965},
     {"kuzey", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"giriş", 1, {DICTIONARY_ENTRANCE}, -1},
     {"asma kat", 1, {DICTIONARY_LEVEL_MEZZANINE}, -1},
-    {"nolu", 1, {DICTIONARY_NUMBER}, 4943},
+    {"cd", 1, {DICTIONARY_STREET_TYPE}, 4963},
+    {"bati", 1, {DICTIONARY_DIRECTIONAL}, 4946},
     {"otoyolu", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"yol", 1, {DICTIONARY_STREET_TYPE}, 4968},
     {"güney", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"arasinda", 1, {DICTIONARY_CROSS_STREET}, 4932},
+    {"sag", 1, {DICTIONARY_UNIT_DIRECTION}, 4969},
+    {"z.k", 1, {DICTIONARY_LEVEL_STANDALONE}, 4952},
     {"yolu", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"b", 1, {DICTIONARY_DIRECTIONAL}, 4946},
+    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4970},
+    {"bey", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"z k", 1, {DICTIONARY_LEVEL_STANDALONE}, 4952},
     {"cadde", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"zk", 1, {DICTIONARY_LEVEL_STANDALONE}, 4941},
     {"sağ", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
+    {"d", 1, {DICTIONARY_DIRECTIONAL}, 4947},
+    {"sok", 1, {DICTIONARY_STREET_TYPE}, 4967},
     {"apartman", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"mahallesi", 1, {DICTIONARY_QUALIFIER}, -1},
     {"kat", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
+    {"koyu", 1, {DICTIONARY_QUALIFIER}, 4959},
     {"merdiven", 1, {DICTIONARY_STAIRCASE}, -1},
     {"bodrum", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
-    {"yol", 1, {DICTIONARY_STREET_TYPE}, 4957},
-    {"mah", 1, {DICTIONARY_QUALIFIER}, 4949},
-    {"ap", 1, {DICTIONARY_UNIT_NUMBERED}, 4959},
+    {"bulvari", 1, {DICTIONARY_STREET_TYPE}, 4962},
+    {"koprusu", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 4956},
     {"d", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"çevreyolu", 1, {DICTIONARY_STREET_TYPE}, 4954},
-    {"bulvari", 1, {DICTIONARY_STREET_TYPE}, 4951},
-    {"z k", 1, {DICTIONARY_LEVEL_STANDALONE}, 4941},
+    {"no", 1, {DICTIONARY_NUMBER}, 4953},
+    {"cevre yolu", 1, {DICTIONARY_STREET_TYPE}, 4965},
+    {"mah", 1, {DICTIONARY_QUALIFIER}, 4961},
+    {"k", 1, {DICTIONARY_LEVEL_NUMBERED}, 4951},
+    {"giris", 1, {DICTIONARY_ENTRANCE}, 4950},
     {"arasında", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"p k", 1, {DICTIONARY_POST_OFFICE}, 4946},
-    {"bl", 1, {DICTIONARY_STREET_TYPE}, 4951},
+    {"sok", 1, {DICTIONARY_STREET_TYPE}, 4966},
+    {"d", 1, {DICTIONARY_UNIT_NUMBERED}, 4971},
     {"g", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"sk", 1, {DICTIONARY_STREET_TYPE}, 4955},
-    {"sokagi", 1, {DICTIONARY_STREET_TYPE}, 4956},
+    {"g", 1, {DICTIONARY_DIRECTIONAL}, 4948},
     {"köşesinde", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"no:", 1, {DICTIONARY_NUMBER}, 4942},
+    {"cad", 1, {DICTIONARY_STREET_TYPE}, 4963},
+    {"p k", 1, {DICTIONARY_POST_OFFICE}, 4957},
     {"batı", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"kose", 1, {DICTIONARY_CROSS_STREET}, 4933},
-    {"pk", 1, {DICTIONARY_POST_OFFICE}, 4946},
+    {"pk", 1, {DICTIONARY_POST_OFFICE}, 4957},
+    {"kose", 1, {DICTIONARY_CROSS_STREET}, 4944},
+    {"dogu", 1, {DICTIONARY_DIRECTIONAL}, 4947},
     {"il", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"cevre yolu", 1, {DICTIONARY_STREET_TYPE}, 4954},
     {"sultan", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"sag", 1, {DICTIONARY_UNIT_DIRECTION}, 4958},
     {"sokağı", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"d", 1, {DICTIONARY_DIRECTIONAL}, 4936},
+    {"sk", 1, {DICTIONARY_STREET_TYPE}, 4966},
     {"oda", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"guney", 1, {DICTIONARY_DIRECTIONAL}, 4937},
     {"zemin kat", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"köşe", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"g", 1, {DICTIONARY_DIRECTIONAL}, 4937},
     {"ilçe", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"cad", 1, {DICTIONARY_STREET_TYPE}, 4953},
-    {"koprusu", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 4945},
+    {"cd", 1, {DICTIONARY_STREET_TYPE}, 4964},
     {"numarala", 1, {DICTIONARY_NUMBER}, -1},
-    {"z.k", 1, {DICTIONARY_LEVEL_STANDALONE}, 4941},
+    {"bl", 1, {DICTIONARY_STREET_TYPE}, 4962},
     {"köprüsü", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},
     {"bulvarı", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"cad", 1, {DICTIONARY_STREET_TYPE}, 4952},
+    {"guney", 1, {DICTIONARY_DIRECTIONAL}, 4948},
     {"posta kutusu", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"hanim", 1, {DICTIONARY_PERSONAL_TITLE}, 4944},
-    {"bey", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"ilce", 1, {DICTIONARY_QUALIFIER}, 4958},
     {"пожежна станція", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"лікарня", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"na rozi", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"пров", 1, {DICTIONARY_STREET_TYPE}, 5054},
+    {"соціальний магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"kv", 1, {DICTIONARY_UNIT_NUMBERED}, 5070},
     {"ковзанка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"naberezhna", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"гавань для екскурсіиних суден", 1, {DICTIONARY_PLACE_NAME}, 4999},
+    {"спортивнии центр", 1, {DICTIONARY_PLACE_NAME}, 5013},
     {"dom", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
-    {"напоі", 1, {DICTIONARY_PLACE_NAME}, 5006},
     {"спритні напої", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"tupik", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"цок пов", 1, {DICTIONARY_LEVEL_BASEMENT}, 4973},
+    {"ниж пов", 1, {DICTIONARY_LEVEL_STANDALONE}, 4991},
+    {"ш", 1, {DICTIONARY_STREET_TYPE}, 5063},
     {"поруч тут", 1, {DICTIONARY_NEAR}, -1},
-    {"міні гольф", 1, {DICTIONARY_PLACE_NAME}, 5000},
     {"прокат велосипедів", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"музей", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"кварт", 1, {DICTIONARY_QUALIFIER}, 5028},
-    {"blyzko", 1, {DICTIONARY_NEAR}, 4982},
+    {"дор", 1, {DICTIONARY_STREET_TYPE}, 5050},
+    {"прокат автомобілів", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"skhid", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"mizh", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"№", 1, {DICTIONARY_NUMBER}, 4984},
-    {"руіни", 1, {DICTIONARY_PLACE_NAME}, 4997},
+    {"торговии центр", 1, {DICTIONARY_PLACE_NAME}, 5029},
+    {"тематичнии парк", 1, {DICTIONARY_PLACE_NAME}, 5034},
+    {"na rozi", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"руїни", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"оф", 1, {DICTIONARY_UNIT_NUMBERED}, 5066},
+    {"біля", 1, {DICTIONARY_NEAR}, -1},
     {"вино", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ниж пов", 1, {DICTIONARY_LEVEL_STANDALONE}, 4980},
+    {"будинки для людеи похилого віку", 1, {DICTIONARY_PLACE_NAME}, 5004},
+    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4973},
+    {"замок", 1, {DICTIONARY_PLACE_NAME}, 5006},
+    {"в'язниця", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ofis", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"обл", 1, {DICTIONARY_QUALIFIER}, 5030},
-    {"nab", 1, {DICTIONARY_STREET_TYPE}, 5042},
     {"pivnikh", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"мост", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"rozi", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"навколо", 1, {DICTIONARY_NEAR}, -1},
     {"нижній поверх", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"право", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"кв", 1, {DICTIONARY_UNIT_NUMBERED}, 5058},
-    {"торговии центр", 1, {DICTIONARY_PLACE_NAME}, 5018},
+    {"с", 1, {DICTIONARY_DIRECTIONAL}, 4972},
     {"sberbank", 1, {DICTIONARY_CHAIN}, -1},
     {"z", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"а / с", 1, {DICTIONARY_POST_OFFICE}, 5024},
     {"подарунки", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"пам’ятник", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"тренажернии зал", 1, {DICTIONARY_PLACE_NAME}, 5000},
     {"південь", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"продовольчий магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"автомагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"пр", 1, {DICTIONARY_STREET_TYPE}, 5058},
     {"туристична агенція", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"пляжнии курорт", 1, {DICTIONARY_PLACE_NAME}, 4998},
+    {"д", 1, {DICTIONARY_HOUSE_NUMBER}, 4980},
     {"тренажерний зал", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"doroha", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"клініка", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"культова споруда", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"місце для пікніків", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"нічнии клуб", 1, {DICTIONARY_PLACE_NAME}, 4991},
-    {"k", 1, {DICTIONARY_UNIT_NUMBERED}, 5061},
+    {"pivden", 1, {DICTIONARY_DIRECTIONAL}, 4977},
     {"салон", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"пров", 1, {DICTIONARY_STREET_TYPE}, 5043},
-    {"kv", 1, {DICTIONARY_UNIT_NUMBERED}, 5059},
-    {"ювелірнии магазин", 1, {DICTIONARY_PLACE_NAME}, 5014},
+    {"бігова доріжка", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4979},
+    {"pr", 1, {DICTIONARY_STREET_TYPE}, 5060},
     {"модний одяг", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"бордель", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"бібліотека", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"kvart", 1, {DICTIONARY_QUALIFIER}, 5029},
+    {"дитячии маиданчик", 1, {DICTIONARY_PLACE_NAME}, 5012},
     {"квіти", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"маиданчик для треилерів", 1, {DICTIONARY_PLACE_NAME}, 5020},
-    {"к", 1, {DICTIONARY_UNIT_NUMBERED}, 5060},
-    {"півд", 1, {DICTIONARY_DIRECTIONAL}, 4965},
-    {"туп", 1, {DICTIONARY_STREET_TYPE}, 5054},
+    {"образотворче мистецтво", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"поруч", 1, {DICTIONARY_NEAR}, -1},
     {"гавань для екскурсійних суден", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"вхід", 1, {DICTIONARY_ENTRANCE}, -1},
     {"стоматологія", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"пов", 1, {DICTIONARY_LEVEL_NUMBERED}, 4975},
-    {"ал", 1, {DICTIONARY_STREET_TYPE}, 5034},
+    {"но", 1, {DICTIONARY_NUMBER}, 4994},
     {"крематорій", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"pivn", 1, {DICTIONARY_DIRECTIONAL}, 4964},
     {"літера", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"pivden", 1, {DICTIONARY_DIRECTIONAL}, 4966},
-    {"al", 1, {DICTIONARY_STREET_TYPE}, 5035},
     {"раион", 1, {DICTIONARY_QUALIFIER}, -1},
     {"парк", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"dor", 1, {DICTIONARY_STREET_TYPE}, 5040},
-    {"з", 1, {DICTIONARY_DIRECTIONAL}, 4967},
-    {"моднии одяг", 1, {DICTIONARY_PLACE_NAME}, 5012},
-    {"кв", 1, {DICTIONARY_QUALIFIER}, 5028},
     {"проспект", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"nab", 1, {DICTIONARY_STREET_TYPE}, 5053},
     {"ветлікарня", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"tsok pov", 1, {DICTIONARY_LEVEL_BASEMENT}, 4974},
+    {"d", 1, {DICTIONARY_HOUSE_NUMBER}, 4981},
+    {"продовольчии магазин", 1, {DICTIONARY_PLACE_NAME}, 5028},
     {"банк", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"bud", 1, {DICTIONARY_HOUSE_NUMBER}, 4983},
     {"склад", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"blvd", 1, {DICTIONARY_STREET_TYPE}, 5038},
+    {"півд", 1, {DICTIONARY_DIRECTIONAL}, 4976},
+    {"художніи салон", 1, {DICTIONARY_PLACE_NAME}, 5016},
     {"tut", 1, {DICTIONARY_NEAR}, -1},
+    {"крематоріи", 1, {DICTIONARY_PLACE_NAME}, 4999},
     {"амбасада", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"pov", 1, {DICTIONARY_LEVEL_NUMBERED}, 4976},
     {"v", 1, {DICTIONARY_NEAR}, -1},
     {"blok", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"ал", 1, {DICTIONARY_STREET_TYPE}, 5045},
     {"poruch", 1, {DICTIONARY_NEAR}, -1},
     {"linya", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"kab", 1, {DICTIONARY_UNIT_NUMBERED}, 5061},
+    {"напоі", 1, {DICTIONARY_PLACE_NAME}, 5017},
+    {"no", 1, {DICTIONARY_NUMBER}, 4994},
+    {"моднии одяг", 1, {DICTIONARY_PLACE_NAME}, 5023},
+    {"пляжнии курорт", 1, {DICTIONARY_PLACE_NAME}, 5009},
     {"мерія", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"м'ясо", 1, {DICTIONARY_PLACE_NAME}, 5007},
-    {"д", 1, {DICTIONARY_HOUSE_NUMBER}, 4969},
+    {"кв", 1, {DICTIONARY_QUALIFIER}, 5039},
+    {"i", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"pidval", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
-    {"торгівельно розважальний центр", 1, {DICTIONARY_PLACE_NAME}, 5015},
-    {"кв-л", 1, {DICTIONARY_QUALIFIER}, 5028},
-    {"lit", 1, {DICTIONARY_UNIT_NUMBERED}, 5065},
-    {"тренажернии зал", 1, {DICTIONARY_PLACE_NAME}, 4989},
+    {"kvart", 1, {DICTIONARY_QUALIFIER}, 5040},
+    {"кварт", 1, {DICTIONARY_QUALIFIER}, 5039},
     {"мобільні телефони", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"nyzh pov", 1, {DICTIONARY_LEVEL_STANDALONE}, 4981},
+    {"буд", 1, {DICTIONARY_HOUSE_NUMBER}, 4982},
     {"храм", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"комп'ютерна крамниця", 1, {DICTIONARY_PLACE_NAME}, 5021},
     {"kvartal", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"s", 1, {DICTIONARY_DIRECTIONAL}, 4962},
+    {"лин", 1, {DICTIONARY_STREET_TYPE}, 5061},
     {"ploshcha", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"гостьовий будинок", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"k-t", 1, {DICTIONARY_UNIT_NUMBERED}, 5061},
+    {"№", 1, {DICTIONARY_NUMBER}, 4995},
     {"pravo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
-    {"півн", 1, {DICTIONARY_DIRECTIONAL}, 4963},
     {"цвинтар", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"база відпочинку", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"прокат автомобілів", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"bul", 1, {DICTIONARY_STREET_TYPE}, 5048},
+    {"набережна", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"продовольчі товари", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"веломагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"lin", 1, {DICTIONARY_STREET_TYPE}, 5051},
-    {"riven", 1, {DICTIONARY_LEVEL_NUMBERED}, 4977},
     {"місце стоянки для велосипедів", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"торговий центр", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"а / с", 1, {DICTIONARY_POST_OFFICE}, 5035},
     {"в", 1, {DICTIONARY_NEAR}, -1},
-    {"к-т", 1, {DICTIONARY_UNIT_NUMBERED}, 5060},
     {"залізнична станція", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"одяг", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"tsokolnyy poverkh", 1, {DICTIONARY_LEVEL_BASEMENT}, 4974},
+    {"km", 1, {DICTIONARY_UNIT_NUMBERED}, 5074},
     {"prospekt", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"між", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"книгарня", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"bulvar", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"міні-маркет", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"офіснии будинок", 1, {DICTIONARY_PLACE_NAME}, 5005},
+    {"гірськии притулок", 1, {DICTIONARY_PLACE_NAME}, 5030},
     {"дорога", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"pershyy poverkh", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"сільпо", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"bl", 1, {DICTIONARY_QUALIFIER}, 5038},
+    {"obl", 1, {DICTIONARY_QUALIFIER}, 5042},
     {"тематичний парк", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"академіка", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"prkt", 1, {DICTIONARY_STREET_TYPE}, 5060},
     {"privatbank", 1, {DICTIONARY_CHAIN}, -1},
     {"мотоцикли", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"oblast", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"ювелірнии магазин", 1, {DICTIONARY_PLACE_NAME}, 5025},
     {"башта", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"спритні напоі", 1, {DICTIONARY_PLACE_NAME}, 5004},
-    {"кімната", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"художній салон", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"замок", 1, {DICTIONARY_PLACE_NAME}, 4995},
     {"громадський заклад", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"наб", 1, {DICTIONARY_STREET_TYPE}, 5041},
     {"і", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"vulytsya", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"pid", 1, {DICTIONARY_NEAR}, -1},
-    {"гірськии притулок", 1, {DICTIONARY_PLACE_NAME}, 5019},
-    {"бігова доріжка", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"пам'ятник", 1, {DICTIONARY_PLACE_NAME}, 5007},
     {"офіс", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"поромна станція", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"obl", 1, {DICTIONARY_QUALIFIER}, 5031},
     {"будинок", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
-    {"автомиика", 1, {DICTIONARY_PLACE_NAME}, 4986},
-    {"i", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"килими", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"r-n", 1, {DICTIONARY_QUALIFIER}, 5044},
     {"пральня", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"приватбанк", 1, {DICTIONARY_CHAIN}, -1},
     {"kut", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"за́мок", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"півн", 1, {DICTIONARY_DIRECTIONAL}, 4974},
     {"у", 1, {DICTIONARY_NEAR}, -1},
     {"турбаза", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"litera", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"майданчик для трейлерів", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"соціальнии магазин", 1, {DICTIONARY_PLACE_NAME}, 5009},
-    {"в'язниця", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"хімтовари", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"tsok pov", 1, {DICTIONARY_LEVEL_BASEMENT}, 4985},
     {"ощадбанк", 1, {DICTIONARY_CHAIN}, -1},
-    {"каб", 1, {DICTIONARY_UNIT_NUMBERED}, 5060},
+    {"газетнии кіоск", 1, {DICTIONARY_PLACE_NAME}, 5027},
     {"фонтан", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"но", 1, {DICTIONARY_NUMBER}, 4983},
+    {"лікарня", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"сауна", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"літ", 1, {DICTIONARY_UNIT_NUMBERED}, 5064},
     {"міліція (поліція)", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"нічнии клуб", 1, {DICTIONARY_PLACE_NAME}, 5002},
     {"гірський притулок", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"мотель", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"r-n", 1, {DICTIONARY_QUALIFIER}, 5033},
     {"меблі", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"of", 1, {DICTIONARY_UNIT_NUMBERED}, 5067},
     {"цокольний поверх", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
     {"s", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"торгівельно-розважальний центр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"фотомагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"zakhid", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"дитячии садок", 1, {DICTIONARY_PLACE_NAME}, 5001},
     {"шосе", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"торгівельно-розважальнии центр", 1, {DICTIONARY_PLACE_NAME}, 5015},
-    {"газетнии кіоск", 1, {DICTIONARY_PLACE_NAME}, 5016},
     {"alleya", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"kv", 1, {DICTIONARY_QUALIFIER}, 5029},
+    {"автомиика", 1, {DICTIONARY_PLACE_NAME}, 4997},
     {"площа", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"kv-l", 1, {DICTIONARY_QUALIFIER}, 5040},
     {"skhody", 1, {DICTIONARY_STAIRCASE}, -1},
-    {"авто маистерня", 1, {DICTIONARY_PLACE_NAME}, 5008},
     {"канцтовари", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"аллея", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"kimnata", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"navkolo", 1, {DICTIONARY_NEAR}, -1},
     {"каплиця", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"міні гольф", 1, {DICTIONARY_PLACE_NAME}, 5011},
+    {"бул", 1, {DICTIONARY_STREET_TYPE}, 5047},
     {"стадіон", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"of", 1, {DICTIONARY_UNIT_NUMBERED}, 5078},
     {"хостел", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"kvartyra", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"поверх", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"блок", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"пам'ятник", 1, {DICTIONARY_PLACE_NAME}, 4996},
     {"poruch tut", 1, {DICTIONARY_NEAR}, -1},
-    {"хімтовари", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"аудіо техніка", 1, {DICTIONARY_PLACE_NAME}, 5013},
-    {"коледж", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"нічний клуб", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"торгівельно-розважальнии центр", 1, {DICTIONARY_PLACE_NAME}, 5026},
+    {"авто маистерня", 1, {DICTIONARY_PLACE_NAME}, 5019},
     {"супермаркет", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"аптека", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"риба", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"міні-гольф", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"салон краси", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"просп", 1, {DICTIONARY_STREET_TYPE}, 5048},
-    {"басеин", 1, {DICTIONARY_PLACE_NAME}, 5003},
     {"вулиця", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"таксі", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"маиданчик для треилерів", 1, {DICTIONARY_PLACE_NAME}, 5031},
     {"кинотеатр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"poblyzu", 1, {DICTIONARY_NEAR}, -1},
+    {"каб", 1, {DICTIONARY_UNIT_NUMBERED}, 5071},
     {"під", 1, {DICTIONARY_NEAR}, -1},
+    {"міні маркет", 1, {DICTIONARY_PLACE_NAME}, 5022},
     {"bilya", 1, {DICTIONARY_NEAR}, -1},
     {"дом", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
     {"nyzhniy poverkh", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
-    {"біля", 1, {DICTIONARY_NEAR}, -1},
-    {"ш", 1, {DICTIONARY_STREET_TYPE}, 5052},
+    {"пов", 1, {DICTIONARY_LEVEL_NUMBERED}, 4986},
     {"riven'", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
+    {"abonementnykh skrynka", 1, {DICTIONARY_POST_OFFICE}, 5036},
     {"ресторан", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"зоомагазин", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"вул", 1, {DICTIONARY_STREET_TYPE}, 5056},
+    {"громадськии центр", 1, {DICTIONARY_PLACE_NAME}, 4998},
+    {"аудіо техніка", 1, {DICTIONARY_PLACE_NAME}, 5024},
+    {"dor", 1, {DICTIONARY_STREET_TYPE}, 5051},
     {"укриття", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"u", 1, {DICTIONARY_NEAR}, -1},
-    {"гостьовии будинок", 1, {DICTIONARY_PLACE_NAME}, 5021},
     {"линия", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"мистецькии центр", 1, {DICTIONARY_PLACE_NAME}, 4985},
+    {"з", 1, {DICTIONARY_DIRECTIONAL}, 4978},
+    {"пр", 1, {DICTIONARY_STREET_TYPE}, 5059},
     {"міськвиконком", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"поруч з", 1, {DICTIONARY_NEAR}, -1},
     {"pivden'", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"цок пов", 1, {DICTIONARY_LEVEL_BASEMENT}, 4984},
+    {"blvd", 1, {DICTIONARY_STREET_TYPE}, 5049},
     {"proyezd", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"пр", 1, {DICTIONARY_STREET_TYPE}, 5047},
+    {"kv", 1, {DICTIONARY_QUALIFIER}, 5040},
     {"nomer", 1, {DICTIONARY_NUMBER}, -1},
-    {"дор", 1, {DICTIONARY_STREET_TYPE}, 5039},
-    {"kv-l", 1, {DICTIONARY_QUALIFIER}, 5029},
-    {"bul", 1, {DICTIONARY_STREET_TYPE}, 5037},
-    {"persh pov", 1, {DICTIONARY_LEVEL_STANDALONE}, 4979},
-    {"за́мок", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"будинки для людеи похилого віку", 1, {DICTIONARY_PLACE_NAME}, 4993},
-    {"бул", 1, {DICTIONARY_STREET_TYPE}, 5036},
-    {"pr", 1, {DICTIONARY_STREET_TYPE}, 5049},
+    {"pov", 1, {DICTIONARY_LEVEL_NUMBERED}, 4987},
+    {"просп", 1, {DICTIONARY_STREET_TYPE}, 5059},
+    {"lin", 1, {DICTIONARY_STREET_TYPE}, 5062},
+    {"nyzh pov", 1, {DICTIONARY_LEVEL_STANDALONE}, 4992},
+    {"обл", 1, {DICTIONARY_QUALIFIER}, 5041},
     {"shose", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pro", 1, {DICTIONARY_STREET_TYPE}, 5044},
-    {"громадськии заклад", 1, {DICTIONARY_PLACE_NAME}, 4992},
+    {"торгівельно розважальний центр", 1, {DICTIONARY_PLACE_NAME}, 5026},
+    {"кв-л", 1, {DICTIONARY_QUALIFIER}, 5039},
+    {"sh", 1, {DICTIONARY_STREET_TYPE}, 5064},
+    {"pivd", 1, {DICTIONARY_DIRECTIONAL}, 4977},
     {"oschadbank", 1, {DICTIONARY_CHAIN}, -1},
     {"кут", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"паб", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"провулок", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"торгівельно розважальнии центр", 1, {DICTIONARY_PLACE_NAME}, 5015},
-    {"буд", 1, {DICTIONARY_HOUSE_NUMBER}, 4971},
     {"пошта", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"квартира", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
-    {"vul", 1, {DICTIONARY_STREET_TYPE}, 5057},
     {"маршала", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"boulevard", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"pl", 1, {DICTIONARY_STREET_TYPE}, 5046},
     {"област", 1, {DICTIONARY_QUALIFIER}, -1},
     {"автомийка", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"виносна торгівля", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"bud", 1, {DICTIONARY_HOUSE_NUMBER}, 4972},
+    {"басеин", 1, {DICTIONARY_PLACE_NAME}, 5014},
+    {"громадськии заклад", 1, {DICTIONARY_PLACE_NAME}, 5003},
+    {"pro", 1, {DICTIONARY_STREET_TYPE}, 5055},
     {"бар", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"аудіо-техніка", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"міні маркет", 1, {DICTIONARY_PLACE_NAME}, 5011},
-    {"набережна", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"громадськии центр", 1, {DICTIONARY_PLACE_NAME}, 4987},
+    {"tupik", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"мистецькии центр", 1, {DICTIONARY_PLACE_NAME}, 4996},
+    {"к-т", 1, {DICTIONARY_UNIT_NUMBERED}, 5071},
     {"livo", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"kabinet", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"бульвар", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"abonementnykh skrynka", 1, {DICTIONARY_POST_OFFICE}, 5025},
+    {"k", 1, {DICTIONARY_UNIT_NUMBERED}, 5072},
+    {"торгівельно розважальнии центр", 1, {DICTIONARY_PLACE_NAME}, 5026},
+    {"туп", 1, {DICTIONARY_STREET_TYPE}, 5065},
     {"комп’ютерна крамниця", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"мистецький центр", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"дитячии маиданчик", 1, {DICTIONARY_PLACE_NAME}, 5001},
+    {"no", 1, {DICTIONARY_NUMBER}, 4995},
     {"на розі", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"поруч з мною", 1, {DICTIONARY_NEAR}, -1},
-    {"комп'ютерна крамниця", 1, {DICTIONARY_PLACE_NAME}, 5010},
     {"vkhid", 1, {DICTIONARY_ENTRANCE}, -1},
     {"школа", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"prkt", 1, {DICTIONARY_STREET_TYPE}, 5049},
-    {"бл", 1, {DICTIONARY_QUALIFIER}, 5026},
     {"казино", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"raion", 1, {DICTIONARY_QUALIFIER}, -1},
     {"готель", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"універсам", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"vul", 1, {DICTIONARY_STREET_TYPE}, 5068},
+    {"blyzko", 1, {DICTIONARY_NEAR}, 4993},
     {"відео", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"страхування", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"будинки для людей похилого віку", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"persh pov", 1, {DICTIONARY_LEVEL_STANDALONE}, 4990},
+    {"спритні напоі", 1, {DICTIONARY_PLACE_NAME}, 5015},
     {"офісний будинок", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"абонементна скринька", 1, {DICTIONARY_POST_OFFICE}, -1},
+    {"гавань для екскурсіиних суден", 1, {DICTIONARY_PLACE_NAME}, 5010},
     {"budnyok", 1, {DICTIONARY_HOUSE_NUMBER}, -1},
-    {"продовольчии магазин", 1, {DICTIONARY_PLACE_NAME}, 5017},
     {"хозтовари", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"к", 1, {DICTIONARY_UNIT_NUMBERED}, 5071},
+    {"бл", 1, {DICTIONARY_QUALIFIER}, 5037},
     {"ювелірний магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"poruch z", 1, {DICTIONARY_NEAR}, -1},
     {"аеропорт", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"тупик", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"пекарня", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"kab", 1, {DICTIONARY_UNIT_NUMBERED}, 5072},
+    {"tup", 1, {DICTIONARY_STREET_TYPE}, 5066},
     {"оптика", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"аквапарку", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"z", 1, {DICTIONARY_DIRECTIONAL}, 4968},
-    {"a / s", 1, {DICTIONARY_POST_OFFICE}, 5025},
-    {"№", 1, {DICTIONARY_NUMBER}, 4983},
-    {"лин", 1, {DICTIONARY_STREET_TYPE}, 5050},
+    {"пл", 1, {DICTIONARY_STREET_TYPE}, 5056},
+    {"сільпо", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"м'ясо", 1, {DICTIONARY_PLACE_NAME}, 5018},
+    {"соціальнии магазин", 1, {DICTIONARY_PLACE_NAME}, 5020},
     {"дитячий садок", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"дитячии садок", 1, {DICTIONARY_PLACE_NAME}, 4990},
+    {"кв", 1, {DICTIONARY_UNIT_NUMBERED}, 5069},
+    {"км", 1, {DICTIONARY_UNIT_NUMBERED}, 5073},
     {"ліво", 1, {DICTIONARY_UNIT_DIRECTION}, -1},
     {"лікарі", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"літ", 1, {DICTIONARY_UNIT_NUMBERED}, 5075},
     {"швидке харчування", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"громадський центр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"сбербанк", 1, {DICTIONARY_CHAIN}, -1},
     {"автовокзал", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"зоопарк", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"k-t", 1, {DICTIONARY_UNIT_NUMBERED}, 5072},
     {"м’ясо", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ферма", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"універмаг", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"d", 1, {DICTIONARY_HOUSE_NUMBER}, 4970},
+    {"поблизу", 1, {DICTIONARY_NEAR}, -1},
     {"схід", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"тут", 1, {DICTIONARY_NEAR}, -1},
     {"с", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"pivd", 1, {DICTIONARY_DIRECTIONAL}, 4966},
-    {"перш пов", 1, {DICTIONARY_LEVEL_STANDALONE}, 4978},
     {"маєток", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"кафе", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"авто майстерня", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"lit", 1, {DICTIONARY_UNIT_NUMBERED}, 5076},
     {"wog", 1, {DICTIONARY_CHAIN}, -1},
     {"морозиво", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"provulok", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"взуття", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"оф", 1, {DICTIONARY_UNIT_NUMBERED}, 5077},
     {"північ", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"офіснии будинок", 1, {DICTIONARY_PLACE_NAME}, 4994},
     {"агентство нерухомості", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"хімчистка", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"музеи", 1, {DICTIONARY_PLACE_NAME}, 5022},
-    {"пл", 1, {DICTIONARY_STREET_TYPE}, 5045},
     {"перукарня", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"поле для гольфу", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"університет", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"pivn", 1, {DICTIONARY_DIRECTIONAL}, 4975},
+    {"al", 1, {DICTIONARY_STREET_TYPE}, 5046},
     {"рівень", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"зроби сам", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"№", 1, {DICTIONARY_NUMBER}, 4994},
+    {"a / s", 1, {DICTIONARY_POST_OFFICE}, 5036},
     {"обмін валют", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"квартал", 1, {DICTIONARY_QUALIFIER}, -1},
     {"автозапчастини", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"напої", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"басейн", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"no", 1, {DICTIONARY_NUMBER}, 4983},
+    {"будинки для людей похилого віку", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"кіоск", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"станція метро", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"км", 1, {DICTIONARY_UNIT_NUMBERED}, 5062},
     {"abonementnykh skrynʹka", 1, {DICTIONARY_POST_OFFICE}, -1},
     {"захід", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"театр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"розі", 1, {DICTIONARY_CROSS_STREET}, -1},
-    {"художніи салон", 1, {DICTIONARY_PLACE_NAME}, 5005},
-    {"нічний клуб", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"соціальний магазин", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"кімната", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
+    {"коледж", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"р-н", 1, {DICTIONARY_QUALIFIER}, 5043},
+    {"музеи", 1, {DICTIONARY_PLACE_NAME}, 5033},
     {"іграшки", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"проезд", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ритуальні послуги", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -83063,50 +83115,46 @@ address_expansion_rule_t expansion_rules[] = {
     {"овочі, фрукти", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"д", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"близько", 1, {DICTIONARY_NEAR}, -1},
-    {"пр", 1, {DICTIONARY_STREET_TYPE}, 5048},
+    {"вул", 1, {DICTIONARY_STREET_TYPE}, 5067},
+    {"pl", 1, {DICTIONARY_STREET_TYPE}, 5057},
     {"магазин електроніки", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"гуртожиток", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"tsokolʹnyy poverkh", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
-    {"образотворче мистецтво", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"крематоріи", 1, {DICTIONARY_PLACE_NAME}, 4988},
     {"кабінет", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"з", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"студія", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"сад", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"tup", 1, {DICTIONARY_STREET_TYPE}, 5055},
+    {"гостьовии будинок", 1, {DICTIONARY_PLACE_NAME}, 5032},
     {"перший поверх", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
     {"blyzʹko", 1, {DICTIONARY_NEAR}, -1},
-    {"тематичнии парк", 1, {DICTIONARY_PLACE_NAME}, 5023},
     {"будинок престарілих", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"d", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"поблизу", 1, {DICTIONARY_NEAR}, -1},
+    {"виносна торгівля", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"poruch z mnoyu", 1, {DICTIONARY_NEAR}, -1},
     {"генерала", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"riven", 1, {DICTIONARY_LEVEL_NUMBERED}, 4988},
     {"номер", 1, {DICTIONARY_NUMBER}, -1},
+    {"tsokolnyy poverkh", 1, {DICTIONARY_LEVEL_BASEMENT}, 4985},
     {"мисливська вежа", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"банкомат", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"km", 1, {DICTIONARY_UNIT_NUMBERED}, 5063},
     {"автошкола", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ш", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"спортивний центр", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"сходи", 1, {DICTIONARY_STAIRCASE}, -1},
     {"сад та город", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"руіни", 1, {DICTIONARY_PLACE_NAME}, 5008},
     {"підвал", 1, {DICTIONARY_LEVEL_BASEMENT}, -1},
     {"суд", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"no", 1, {DICTIONARY_NUMBER}, 4984},
     {"пляжний курорт", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"послуги копіювання", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"прокат авто", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"газетний кіоск", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"с", 1, {DICTIONARY_DIRECTIONAL}, 4961},
     {"шале", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"bl", 1, {DICTIONARY_QUALIFIER}, 5027},
     {"poverkh", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"спортивні товари", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"спортивнии центр", 1, {DICTIONARY_PLACE_NAME}, 5002},
-    {"р-н", 1, {DICTIONARY_QUALIFIER}, 5032},
-    {"sh", 1, {DICTIONARY_STREET_TYPE}, 5053},
+    {"перш пов", 1, {DICTIONARY_LEVEL_STANDALONE}, 4989},
     {"музика", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"наб", 1, {DICTIONARY_STREET_TYPE}, 5052},
     {"дитячий майданчик", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"لین", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ہائی وے", 1, {DICTIONARY_STREET_TYPE}, -1},
@@ -83115,380 +83163,379 @@ address_expansion_rule_t expansion_rules[] = {
     {"روڈ", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ایکسپریس وے", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"سڑک", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"c l b", 1, {DICTIONARY_PLACE_NAME}, 5070},
-    {"san bay", 1, {DICTIONARY_PLACE_NAME}, 5088},
-    {"quoc lo", 1, {DICTIONARY_STREET_TYPE}, 5110},
-    {"cao dang", 1, {DICTIONARY_PLACE_NAME}, 5069},
-    {"v b t", 1, {DICTIONARY_PLACE_NAME}, 5096},
-    {"vươn quốc gia", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"t h", 1, {DICTIONARY_PLACE_NAME}, 5090},
+    {"ks", 1, {DICTIONARY_PLACE_NAME}, 5092},
+    {"nha tho", 1, {DICTIONARY_PLACE_NAME}, 5095},
+    {"vqg", 1, {DICTIONARY_PLACE_NAME}, 5108},
+    {"cty", 1, {DICTIONARY_PLACE_NAME}, 5083},
+    {"tx", 1, {DICTIONARY_QUALIFIER}, 5112},
     {"sân bay quốc tế", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ctcp", 1, {DICTIONARY_PLACE_NAME}, 5071},
-    {"cong vien", 1, {DICTIONARY_PLACE_NAME}, 5074},
-    {"thi tran", 1, {DICTIONARY_QUALIFIER}, 5102},
-    {"đường hẻm", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"cvvh", 1, {DICTIONARY_PLACE_NAME}, 5073},
-    {"đường sắt", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"k c n", 1, {DICTIONARY_PLACE_NAME}, 5078},
+    {"t l", 1, {DICTIONARY_STREET_TYPE}, 5122},
+    {"kdl", 1, {DICTIONARY_PLACE_NAME}, 5090},
+    {"cv", 1, {DICTIONARY_PLACE_NAME}, 5085},
+    {"p", 1, {DICTIONARY_QUALIFIER}, 5109},
+    {"rh", 1, {DICTIONARY_PLACE_NAME}, 5097},
+    {"ct", 1, {DICTIONARY_STREET_TYPE}, 5114},
     {"công viên", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"r h", 1, {DICTIONARY_PLACE_NAME}, 5086},
-    {"t t t m", 1, {DICTIONARY_PLACE_NAME}, 5093},
-    {"nha thi dau", 1, {DICTIONARY_PLACE_NAME}, 5083},
+    {"trung tam", 1, {DICTIONARY_PLACE_NAME}, 5105},
+    {"quan", 1, {DICTIONARY_QUALIFIER}, 5110},
     {"trung học cơ sở", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"quan", 1, {DICTIONARY_QUALIFIER}, 5099},
+    {"cong truong", 1, {DICTIONARY_STREET_TYPE}, 5114},
     {"thành phố", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"cd", 1, {DICTIONARY_PLACE_NAME}, 5069},
-    {"sbqt", 1, {DICTIONARY_PLACE_NAME}, 5087},
-    {"t l", 1, {DICTIONARY_STREET_TYPE}, 5111},
+    {"ntd", 1, {DICTIONARY_PLACE_NAME}, 5094},
+    {"c c k q", 1, {DICTIONARY_PLACE_NAME}, 5086},
     {"nhà thờ", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"nt", 1, {DICTIONARY_PLACE_NAME}, 5084},
-    {"c t", 1, {DICTIONARY_STREET_TYPE}, 5103},
-    {"k n m", 1, {DICTIONARY_PLACE_NAME}, 5080},
-    {"san van dong", 1, {DICTIONARY_PLACE_NAME}, 5089},
-    {"trung tam thuong mai", 1, {DICTIONARY_PLACE_NAME}, 5093},
+    {"nha thi dau", 1, {DICTIONARY_PLACE_NAME}, 5094},
+    {"quảng trường", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"duong pho", 1, {DICTIONARY_STREET_TYPE}, 5119},
+    {"rap hat", 1, {DICTIONARY_PLACE_NAME}, 5097},
+    {"trung hoc pho thong", 1, {DICTIONARY_PLACE_NAME}, 5103},
+    {"v q g", 1, {DICTIONARY_PLACE_NAME}, 5108},
+    {"tong cong ty", 1, {DICTIONARY_PLACE_NAME}, 5106},
     {"phường", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"cty cp", 1, {DICTIONARY_PLACE_NAME}, 5071},
-    {"ql", 1, {DICTIONARY_STREET_TYPE}, 5110},
-    {"duong hem", 1, {DICTIONARY_STREET_TYPE}, 5106},
-    {"cau lac bo", 1, {DICTIONARY_PLACE_NAME}, 5070},
-    {"tiểu học", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"qt", 1, {DICTIONARY_STREET_TYPE}, 5109},
-    {"q", 1, {DICTIONARY_QUALIFIER}, 5099},
-    {"nha tho", 1, {DICTIONARY_PLACE_NAME}, 5084},
-    {"rh", 1, {DICTIONARY_PLACE_NAME}, 5086},
-    {"pt", 1, {DICTIONARY_PLACE_NAME}, 5085},
-    {"cty c p", 1, {DICTIONARY_PLACE_NAME}, 5071},
+    {"khach san", 1, {DICTIONARY_PLACE_NAME}, 5092},
+    {"cty cp", 1, {DICTIONARY_PLACE_NAME}, 5082},
+    {"trung tam thuong mai", 1, {DICTIONARY_PLACE_NAME}, 5104},
+    {"cong vien", 1, {DICTIONARY_PLACE_NAME}, 5085},
+    {"tl", 1, {DICTIONARY_STREET_TYPE}, 5122},
+    {"dh", 1, {DICTIONARY_PLACE_NAME}, 5087},
+    {"t h p t", 1, {DICTIONARY_PLACE_NAME}, 5103},
+    {"duong sat", 1, {DICTIONARY_PLACE_NAME}, 5088},
+    {"c t", 1, {DICTIONARY_STREET_TYPE}, 5114},
+    {"p t", 1, {DICTIONARY_PLACE_NAME}, 5096},
+    {"sb", 1, {DICTIONARY_PLACE_NAME}, 5099},
+    {"t x", 1, {DICTIONARY_QUALIFIER}, 5112},
     {"q", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"khu du lich", 1, {DICTIONARY_PLACE_NAME}, 5079},
     {"đại học", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"thanh pho", 1, {DICTIONARY_QUALIFIER}, 5100},
+    {"cty c p", 1, {DICTIONARY_PLACE_NAME}, 5082},
+    {"thcs", 1, {DICTIONARY_PLACE_NAME}, 5102},
     {"trung học phổ thông", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"clb", 1, {DICTIONARY_PLACE_NAME}, 5070},
+    {"qt", 1, {DICTIONARY_STREET_TYPE}, 5120},
     {"thị xã", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"kdl", 1, {DICTIONARY_PLACE_NAME}, 5079},
+    {"d", 1, {DICTIONARY_STREET_TYPE}, 5116},
+    {"cong vien van hoa", 1, {DICTIONARY_PLACE_NAME}, 5084},
     {"công ty", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"tl", 1, {DICTIONARY_STREET_TYPE}, 5111},
+    {"san van dong", 1, {DICTIONARY_PLACE_NAME}, 5100},
     {"quận", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"tcty", 1, {DICTIONARY_PLACE_NAME}, 5095},
-    {"cong vien van hoa", 1, {DICTIONARY_PLACE_NAME}, 5073},
-    {"q l", 1, {DICTIONARY_STREET_TYPE}, 5110},
-    {"duong", 1, {DICTIONARY_STREET_TYPE}, 5105},
-    {"kcn", 1, {DICTIONARY_PLACE_NAME}, 5078},
-    {"can cu khong quan", 1, {DICTIONARY_PLACE_NAME}, 5075},
-    {"tong cong ty", 1, {DICTIONARY_PLACE_NAME}, 5095},
-    {"thanh", 1, {DICTIONARY_PERSONAL_TITLE}, 5068},
-    {"thcs", 1, {DICTIONARY_PLACE_NAME}, 5091},
+    {"t t", 1, {DICTIONARY_QUALIFIER}, 5113},
+    {"d h", 1, {DICTIONARY_PLACE_NAME}, 5087},
+    {"sbqt", 1, {DICTIONARY_PLACE_NAME}, 5098},
+    {"svd", 1, {DICTIONARY_PLACE_NAME}, 5100},
+    {"vươn quốc gia", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"tt", 1, {DICTIONARY_QUALIFIER}, 5113},
+    {"dai hoc", 1, {DICTIONARY_PLACE_NAME}, 5087},
+    {"s v d", 1, {DICTIONARY_PLACE_NAME}, 5100},
     {"sân bay", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"t t", 1, {DICTIONARY_QUALIFIER}, 5102},
-    {"thị trấn", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"n h", 1, {DICTIONARY_PLACE_NAME}, 5082},
-    {"duong pho", 1, {DICTIONARY_STREET_TYPE}, 5108},
-    {"c v", 1, {DICTIONARY_PLACE_NAME}, 5074},
-    {"cty", 1, {DICTIONARY_PLACE_NAME}, 5072},
-    {"ds", 1, {DICTIONARY_PLACE_NAME}, 5077},
-    {"svd", 1, {DICTIONARY_PLACE_NAME}, 5089},
-    {"v q g", 1, {DICTIONARY_PLACE_NAME}, 5097},
-    {"trung hoc pho thong", 1, {DICTIONARY_PLACE_NAME}, 5092},
-    {"thánh", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"s v d", 1, {DICTIONARY_PLACE_NAME}, 5089},
-    {"cv", 1, {DICTIONARY_PLACE_NAME}, 5074},
-    {"quang truong", 1, {DICTIONARY_STREET_TYPE}, 5109},
-    {"t h p t", 1, {DICTIONARY_PLACE_NAME}, 5092},
-    {"nhà thi đấu", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"cckq", 1, {DICTIONARY_PLACE_NAME}, 5075},
-    {"ct", 1, {DICTIONARY_STREET_TYPE}, 5103},
-    {"nha hat", 1, {DICTIONARY_PLACE_NAME}, 5082},
-    {"tx", 1, {DICTIONARY_QUALIFIER}, 5101},
-    {"vqg", 1, {DICTIONARY_PLACE_NAME}, 5097},
-    {"đl", 1, {DICTIONARY_STREET_TYPE}, 5104},
-    {"duong nho", 1, {DICTIONARY_STREET_TYPE}, 5107},
-    {"trung tâm thương mại", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"c c k q", 1, {DICTIONARY_PLACE_NAME}, 5075},
-    {"tct", 1, {DICTIONARY_PLACE_NAME}, 5095},
-    {"p", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"tinh lo", 1, {DICTIONARY_STREET_TYPE}, 5111},
-    {"khu công nghiệp", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"n t", 1, {DICTIONARY_PLACE_NAME}, 5084},
-    {"s b", 1, {DICTIONARY_PLACE_NAME}, 5088},
-    {"đường phố", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"vien bao tang", 1, {DICTIONARY_PLACE_NAME}, 5096},
     {"tổng công ty", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"n t d", 1, {DICTIONARY_PLACE_NAME}, 5083},
-    {"t p", 1, {DICTIONARY_QUALIFIER}, 5100},
-    {"vuon quoc gia", 1, {DICTIONARY_PLACE_NAME}, 5097},
-    {"dai hoc", 1, {DICTIONARY_PLACE_NAME}, 5076},
-    {"cong ty co phan", 1, {DICTIONARY_PLACE_NAME}, 5071},
-    {"p", 1, {DICTIONARY_QUALIFIER}, 5098},
-    {"tt", 1, {DICTIONARY_QUALIFIER}, 5102},
-    {"d", 1, {DICTIONARY_STREET_TYPE}, 5105},
-    {"k / s", 1, {DICTIONARY_PLACE_NAME}, 5081},
-    {"nh", 1, {DICTIONARY_PLACE_NAME}, 5082},
-    {"vbt", 1, {DICTIONARY_PLACE_NAME}, 5096},
-    {"tt", 1, {DICTIONARY_PLACE_NAME}, 5094},
+    {"cckq", 1, {DICTIONARY_PLACE_NAME}, 5086},
+    {"th", 1, {DICTIONARY_PLACE_NAME}, 5101},
+    {"phi trong", 1, {DICTIONARY_PLACE_NAME}, 5096},
+    {"q t", 1, {DICTIONARY_STREET_TYPE}, 5120},
+    {"khu nghi mat", 1, {DICTIONARY_PLACE_NAME}, 5091},
+    {"thị trấn", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"tttm", 1, {DICTIONARY_PLACE_NAME}, 5104},
+    {"thánh", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"nt", 1, {DICTIONARY_PLACE_NAME}, 5095},
+    {"t p", 1, {DICTIONARY_QUALIFIER}, 5111},
+    {"đường hẻm", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"vuon quoc gia", 1, {DICTIONARY_PLACE_NAME}, 5108},
+    {"pt", 1, {DICTIONARY_PLACE_NAME}, 5096},
+    {"tiểu học", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"nhà thi đấu", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"khu du lich", 1, {DICTIONARY_PLACE_NAME}, 5090},
+    {"c d", 1, {DICTIONARY_PLACE_NAME}, 5080},
+    {"trung tâm thương mại", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"đường sắt", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"duong nho", 1, {DICTIONARY_STREET_TYPE}, 5118},
+    {"khu công nghiệp", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"tct", 1, {DICTIONARY_PLACE_NAME}, 5106},
+    {"san bay", 1, {DICTIONARY_PLACE_NAME}, 5099},
+    {"duong", 1, {DICTIONARY_STREET_TYPE}, 5116},
+    {"k / s", 1, {DICTIONARY_PLACE_NAME}, 5092},
+    {"đường phố", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"v b t", 1, {DICTIONARY_PLACE_NAME}, 5107},
+    {"c l b", 1, {DICTIONARY_PLACE_NAME}, 5081},
+    {"cd", 1, {DICTIONARY_PLACE_NAME}, 5080},
+    {"nha hat", 1, {DICTIONARY_PLACE_NAME}, 5093},
+    {"p", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"dai lo", 1, {DICTIONARY_STREET_TYPE}, 5115},
+    {"thanh", 1, {DICTIONARY_PERSONAL_TITLE}, 5079},
+    {"k n m", 1, {DICTIONARY_PLACE_NAME}, 5091},
+    {"ctcp", 1, {DICTIONARY_PLACE_NAME}, 5082},
+    {"thi tran", 1, {DICTIONARY_QUALIFIER}, 5113},
+    {"san bay quoc te", 1, {DICTIONARY_PLACE_NAME}, 5098},
+    {"c t c p", 1, {DICTIONARY_PLACE_NAME}, 5082},
     {"căn cứ không quân", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"tỉnh lộ", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"c t c p", 1, {DICTIONARY_PLACE_NAME}, 5071},
+    {"cao dang", 1, {DICTIONARY_PLACE_NAME}, 5080},
+    {"d s", 1, {DICTIONARY_PLACE_NAME}, 5088},
+    {"k c n", 1, {DICTIONARY_PLACE_NAME}, 5089},
     {"rạp hát", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"c d", 1, {DICTIONARY_PLACE_NAME}, 5069},
-    {"cong truong", 1, {DICTIONARY_STREET_TYPE}, 5103},
+    {"t t t m", 1, {DICTIONARY_PLACE_NAME}, 5104},
+    {"s b q t", 1, {DICTIONARY_PLACE_NAME}, 5098},
+    {"vien bao tang", 1, {DICTIONARY_PLACE_NAME}, 5107},
     {"đường nhỏ", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"thpt", 1, {DICTIONARY_PLACE_NAME}, 5103},
+    {"knm", 1, {DICTIONARY_PLACE_NAME}, 5091},
     {"d", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
-    {"s b q t", 1, {DICTIONARY_PLACE_NAME}, 5087},
-    {"th", 1, {DICTIONARY_PLACE_NAME}, 5090},
+    {"tinh lo", 1, {DICTIONARY_STREET_TYPE}, 5122},
+    {"k d l", 1, {DICTIONARY_PLACE_NAME}, 5090},
+    {"s b", 1, {DICTIONARY_PLACE_NAME}, 5099},
     {"câu lạc bộ ", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"nhà hát", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"tieu hoc", 1, {DICTIONARY_PLACE_NAME}, 5090},
-    {"tp", 1, {DICTIONARY_QUALIFIER}, 5100},
-    {"sb", 1, {DICTIONARY_PLACE_NAME}, 5088},
-    {"rap hat", 1, {DICTIONARY_PLACE_NAME}, 5086},
-    {"ph", 1, {DICTIONARY_QUALIFIER}, 5098},
-    {"khach san", 1, {DICTIONARY_PLACE_NAME}, 5081},
-    {"thpt", 1, {DICTIONARY_PLACE_NAME}, 5092},
-    {"phi trong", 1, {DICTIONARY_PLACE_NAME}, 5085},
-    {"công trường", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"ds", 1, {DICTIONARY_PLACE_NAME}, 5088},
+    {"q", 1, {DICTIONARY_QUALIFIER}, 5110},
+    {"c v v h", 1, {DICTIONARY_PLACE_NAME}, 5084},
+    {"đl", 1, {DICTIONARY_STREET_TYPE}, 5115},
+    {"cong ty", 1, {DICTIONARY_PLACE_NAME}, 5083},
+    {"quoc lo", 1, {DICTIONARY_STREET_TYPE}, 5121},
     {"quốc lộ", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"d h", 1, {DICTIONARY_PLACE_NAME}, 5076},
+    {"công trường", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"viện bảo tàng", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"khu cong nghiep", 1, {DICTIONARY_PLACE_NAME}, 5078},
-    {"tttm", 1, {DICTIONARY_PLACE_NAME}, 5093},
+    {"tieu hoc", 1, {DICTIONARY_PLACE_NAME}, 5101},
+    {"cau lac bo", 1, {DICTIONARY_PLACE_NAME}, 5081},
     {"khu du lịch", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"c v v h", 1, {DICTIONARY_PLACE_NAME}, 5073},
-    {"d l", 1, {DICTIONARY_STREET_TYPE}, 5104},
+    {"q l", 1, {DICTIONARY_STREET_TYPE}, 5121},
     {"công viên văn hóa", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"t x", 1, {DICTIONARY_QUALIFIER}, 5101},
-    {"d s", 1, {DICTIONARY_PLACE_NAME}, 5077},
-    {"cao đẳng", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"dai lo", 1, {DICTIONARY_STREET_TYPE}, 5104},
+    {"khách sạn", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"quang truong", 1, {DICTIONARY_STREET_TYPE}, 5120},
+    {"cvvh", 1, {DICTIONARY_PLACE_NAME}, 5084},
+    {"n t d", 1, {DICTIONARY_PLACE_NAME}, 5094},
     {"phi trường", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"t h c s", 1, {DICTIONARY_PLACE_NAME}, 5102},
+    {"thi xa", 1, {DICTIONARY_QUALIFIER}, 5112},
     {"sân vận động", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"ntd", 1, {DICTIONARY_PLACE_NAME}, 5083},
-    {"trung hoc co so", 1, {DICTIONARY_PLACE_NAME}, 5091},
-    {"knm", 1, {DICTIONARY_PLACE_NAME}, 5080},
-    {"thi xa", 1, {DICTIONARY_QUALIFIER}, 5101},
+    {"t t", 1, {DICTIONARY_PLACE_NAME}, 5105},
+    {"tp", 1, {DICTIONARY_QUALIFIER}, 5111},
+    {"ph", 1, {DICTIONARY_QUALIFIER}, 5109},
+    {"tcty", 1, {DICTIONARY_PLACE_NAME}, 5106},
+    {"t h", 1, {DICTIONARY_PLACE_NAME}, 5101},
+    {"tt", 1, {DICTIONARY_PLACE_NAME}, 5105},
     {"khu nghỉ mát", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"quảng trường", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"san bay quoc te", 1, {DICTIONARY_PLACE_NAME}, 5087},
-    {"cong ty", 1, {DICTIONARY_PLACE_NAME}, 5072},
-    {"t t", 1, {DICTIONARY_PLACE_NAME}, 5094},
-    {"ks", 1, {DICTIONARY_PLACE_NAME}, 5081},
+    {"clb", 1, {DICTIONARY_PLACE_NAME}, 5081},
+    {"khu cong nghiep", 1, {DICTIONARY_PLACE_NAME}, 5089},
+    {"r h", 1, {DICTIONARY_PLACE_NAME}, 5097},
+    {"ql", 1, {DICTIONARY_STREET_TYPE}, 5121},
+    {"kcn", 1, {DICTIONARY_PLACE_NAME}, 5089},
+    {"nh", 1, {DICTIONARY_PLACE_NAME}, 5093},
+    {"n h", 1, {DICTIONARY_PLACE_NAME}, 5093},
+    {"duong hem", 1, {DICTIONARY_STREET_TYPE}, 5117},
     {"trung tâm", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"đường", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"khu nghi mat", 1, {DICTIONARY_PLACE_NAME}, 5080},
-    {"trung tam", 1, {DICTIONARY_PLACE_NAME}, 5094},
-    {"t h c s", 1, {DICTIONARY_PLACE_NAME}, 5091},
-    {"k d l", 1, {DICTIONARY_PLACE_NAME}, 5079},
+    {"thanh pho", 1, {DICTIONARY_QUALIFIER}, 5111},
+    {"n t", 1, {DICTIONARY_PLACE_NAME}, 5095},
+    {"vbt", 1, {DICTIONARY_PLACE_NAME}, 5107},
+    {"tỉnh lộ", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"trung hoc co so", 1, {DICTIONARY_PLACE_NAME}, 5102},
     {"đại lộ", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"ngõ", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"dh", 1, {DICTIONARY_PLACE_NAME}, 5076},
-    {"q t", 1, {DICTIONARY_STREET_TYPE}, 5109},
-    {"khách sạn", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"cong ty co phan", 1, {DICTIONARY_PLACE_NAME}, 5082},
+    {"can cu khong quan", 1, {DICTIONARY_PLACE_NAME}, 5086},
+    {"cao đẳng", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"công ty cổ phần", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"duong sat", 1, {DICTIONARY_PLACE_NAME}, 5077},
-    {"p t", 1, {DICTIONARY_PLACE_NAME}, 5085},
+    {"c v", 1, {DICTIONARY_PLACE_NAME}, 5085},
+    {"d l", 1, {DICTIONARY_STREET_TYPE}, 5115},
     {"栋", 1, {DICTIONARY_BUILDING_TYPE}, -1},
     {"duàn", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"cundao", 1, {DICTIONARY_STREET_TYPE}, 5140},
+    {"cundao", 1, {DICTIONARY_STREET_TYPE}, 5151},
     {"xiàn dào", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"shengdao", 1, {DICTIONARY_STREET_TYPE}, 5149},
-    {"dong nan", 1, {DICTIONARY_DIRECTIONAL}, 5124},
+    {"li", 1, {DICTIONARY_QUALIFIER}, 5148},
+    {"dong bei", 1, {DICTIONARY_DIRECTIONAL}, 5133},
     {"邮编", 1, {DICTIONARY_POSTAL_CODE}, -1},
     {"胡同", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"大街", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"lù", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"街", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"shěngdào", 1, {DICTIONARY_STREET_TYPE}, 5149},
-    {"xiandao", 1, {DICTIONARY_STREET_TYPE}, 5150},
+    {"xiangdao", 1, {DICTIONARY_STREET_TYPE}, 5163},
+    {"shěngdào", 1, {DICTIONARY_STREET_TYPE}, 5160},
+    {"lu", 1, {DICTIONARY_STREET_TYPE}, 5159},
     {"縣", 1, {DICTIONARY_QUALIFIER}, -1},
     {"xiàn", 1, {DICTIONARY_QUALIFIER}, -1},
     {"鄉", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"hutong", 1, {DICTIONARY_STREET_TYPE}, 5146},
     {"nán", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"céng", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"xī běi", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"北", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"bei", 1, {DICTIONARY_DIRECTIONAL}, 5113},
-    {"youzheng xinxiang", 1, {DICTIONARY_POST_OFFICE}, 5129},
-    {"dayuan", 1, {DICTIONARY_STREET_TYPE}, 5144},
-    {"xiang", 1, {DICTIONARY_STREET_TYPE}, 5151},
-    {"省道", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"dongnan", 1, {DICTIONARY_DIRECTIONAL}, 5123},
-    {"cun", 1, {DICTIONARY_QUALIFIER}, 5138},
-    {"dong", 1, {DICTIONARY_DIRECTIONAL}, 5114},
+    {"nong", 1, {DICTIONARY_STREET_TYPE}, 5165},
+    {"xiang dao", 1, {DICTIONARY_STREET_TYPE}, 5163},
+    {"lin", 1, {DICTIONARY_QUALIFIER}, 5150},
+    {"ceng", 1, {DICTIONARY_LEVEL_NUMBERED}, 5137},
+    {"邮政信箱", 1, {DICTIONARY_POST_OFFICE}, -1},
+    {"xi nan", 1, {DICTIONARY_DIRECTIONAL}, 5131},
+    {"cūndào", 1, {DICTIONARY_STREET_TYPE}, 5151},
+    {"cun", 1, {DICTIONARY_QUALIFIER}, 5149},
+    {"dongnan", 1, {DICTIONARY_DIRECTIONAL}, 5134},
     {"鄰", 1, {DICTIONARY_QUALIFIER}, -1},
     {"桥", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"大院", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"shěng", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"dong bei", 1, {DICTIONARY_DIRECTIONAL}, 5122},
+    {"道", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"楼", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"lin", 1, {DICTIONARY_QUALIFIER}, 5139},
-    {"xian", 1, {DICTIONARY_QUALIFIER}, 5132},
-    {"xi bei", 1, {DICTIONARY_DIRECTIONAL}, 5118},
+    {"dongbei", 1, {DICTIONARY_DIRECTIONAL}, 5132},
     {"国道", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"xian dao", 1, {DICTIONARY_STREET_TYPE}, 5161},
     {"dōngnán", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"qū", 1, {DICTIONARY_QUALIFIER}, -1},
     {"乡道", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"zhèn", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"dadao", 1, {DICTIONARY_STREET_TYPE}, 5141},
     {"shěng dào", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"nan", 1, {DICTIONARY_DIRECTIONAL}, 5115},
-    {"xian dao", 1, {DICTIONARY_STREET_TYPE}, 5150},
     {"村", 1, {DICTIONARY_QUALIFIER}, -1},
     {"鎮", 1, {DICTIONARY_QUALIFIER}, -1},
     {"xīběi", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"hao", 1, {DICTIONARY_NUMBER}, 5127},
-    {"guodao", 1, {DICTIONARY_STREET_TYPE}, 5145},
     {"dào", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"xi", 1, {DICTIONARY_DIRECTIONAL}, 5116},
+    {"céng", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"西", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"里", 1, {DICTIONARY_QUALIFIER}, -1},
     {"dàjiē", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"樓", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
     {"hào", 2, {DICTIONARY_NUMBER, DICTIONARY_STOPWORD}, -1},
     {"dàdào", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"xiang", 1, {DICTIONARY_QUALIFIER}, 5147},
+    {"jie", 1, {DICTIONARY_STREET_TYPE}, 5158},
     {"cūn", 1, {DICTIONARY_QUALIFIER}, -1},
     {"路", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"shi", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT_NUMBERED}, 5144},
     {"郵編", 1, {DICTIONARY_POSTAL_CODE}, -1},
     {"西南", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"xiang", 1, {DICTIONARY_QUALIFIER}, 5136},
+    {"號", 1, {DICTIONARY_NUMBER}, -1},
     {"yóubiān", 1, {DICTIONARY_POSTAL_CODE}, -1},
     {"东北", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"dongbei", 1, {DICTIONARY_DIRECTIONAL}, 5121},
-    {"道", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"shi", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT_NUMBERED}, 5133},
+    {"zhen", 1, {DICTIONARY_QUALIFIER}, 5146},
+    {"hutong", 1, {DICTIONARY_STREET_TYPE}, 5157},
     {"东", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"段", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"dong", 1, {DICTIONARY_DIRECTIONAL}, 5125},
     {"qiáo", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"jiē", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"youbian", 1, {DICTIONARY_POSTAL_CODE}, 5130},
     {"dōng běi", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"nong", 1, {DICTIONARY_STREET_TYPE}, 5154},
-    {"li", 1, {DICTIONARY_QUALIFIER}, 5137},
-    {"lou", 1, {DICTIONARY_LEVEL_NUMBERED}, 5125},
-    {"號", 1, {DICTIONARY_NUMBER}, -1},
+    {"youbian", 1, {DICTIONARY_POSTAL_CODE}, 5141},
+    {"cun dao", 1, {DICTIONARY_STREET_TYPE}, 5151},
     {"西北", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"xiangdao", 1, {DICTIONARY_STREET_TYPE}, 5152},
     {"巷", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"xi", 1, {DICTIONARY_DIRECTIONAL}, 5127},
     {"东南", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"南", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"室", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"xiāng dào", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"xī", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"dong nan", 1, {DICTIONARY_DIRECTIONAL}, 5135},
+    {"區", 1, {DICTIONARY_QUALIFIER}, -1},
     {"萊爾富", 1, {DICTIONARY_CHAIN}, -1},
-    {"qu", 1, {DICTIONARY_QUALIFIER}, 5134},
-    {"jie", 1, {DICTIONARY_STREET_TYPE}, 5147},
-    {"sheng", 1, {DICTIONARY_QUALIFIER}, 5131},
+    {"guodao", 1, {DICTIONARY_STREET_TYPE}, 5156},
+    {"xiàndào", 1, {DICTIONARY_STREET_TYPE}, 5161},
+    {"qu", 1, {DICTIONARY_QUALIFIER}, 5145},
     {"guódào", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"dayuan", 1, {DICTIONARY_STREET_TYPE}, 5155},
     {"县道", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"dong", 1, {DICTIONARY_BUILDING_TYPE}, 5123},
     {"xīnán", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"duan", 1, {DICTIONARY_STREET_TYPE}, 5164},
     {"dōngběi", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"xiàndào", 1, {DICTIONARY_STREET_TYPE}, 5150},
-    {"大道", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"xiandao", 1, {DICTIONARY_STREET_TYPE}, 5161},
     {"lǐ", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"qiao", 1, {DICTIONARY_PLACE_NAME}, 5128},
-    {"duan", 1, {DICTIONARY_STREET_TYPE}, 5153},
-    {"xiāngdào", 1, {DICTIONARY_STREET_TYPE}, 5152},
+    {"xinan", 1, {DICTIONARY_DIRECTIONAL}, 5130},
+    {"youzheng xinxiang", 1, {DICTIONARY_POST_OFFICE}, 5140},
+    {"dao", 1, {DICTIONARY_STREET_TYPE}, 5154},
     {"běi", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"hútòng", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"dajie", 1, {DICTIONARY_STREET_TYPE}, 5153},
+    {"sheng", 1, {DICTIONARY_QUALIFIER}, 5142},
     {"省", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"xian", 1, {DICTIONARY_QUALIFIER}, 5143},
     {"号", 2, {DICTIONARY_NUMBER, DICTIONARY_STOPWORD}, -1},
-    {"ceng", 1, {DICTIONARY_LEVEL_NUMBERED}, 5126},
     {"yóuzhèng xìnxiāng", 1, {DICTIONARY_POST_OFFICE}, -1},
-    {"cūndào", 1, {DICTIONARY_STREET_TYPE}, 5140},
-    {"xi nan", 1, {DICTIONARY_DIRECTIONAL}, 5120},
+    {"shengdao", 1, {DICTIONARY_STREET_TYPE}, 5160},
+    {"hao", 1, {DICTIONARY_NUMBER}, 5138},
     {"dòng", 1, {DICTIONARY_BUILDING_TYPE}, -1},
     {"dōng", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"lín", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"dadao", 1, {DICTIONARY_STREET_TYPE}, 5152},
     {"xiàng", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"dong", 1, {DICTIONARY_BUILDING_TYPE}, 5112},
-    {"xinan", 1, {DICTIONARY_DIRECTIONAL}, 5119},
     {"全家便利商店", 1, {DICTIONARY_CHAIN}, -1},
+    {"xibei", 1, {DICTIONARY_DIRECTIONAL}, 5128},
     {"层", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"sheng dao", 1, {DICTIONARY_STREET_TYPE}, 5149},
-    {"dajie", 1, {DICTIONARY_STREET_TYPE}, 5142},
-    {"邮政信箱", 1, {DICTIONARY_POST_OFFICE}, -1},
+    {"xi bei", 1, {DICTIONARY_DIRECTIONAL}, 5129},
+    {"sheng dao", 1, {DICTIONARY_STREET_TYPE}, 5160},
+    {"省道", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"xī", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"大道", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"dà yuàn", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"弄", 1, {DICTIONARY_STREET_TYPE}, -1},
-    {"cun dao", 1, {DICTIONARY_STREET_TYPE}, 5140},
-    {"xibei", 1, {DICTIONARY_DIRECTIONAL}, 5117},
-    {"dao", 1, {DICTIONARY_STREET_TYPE}, 5143},
+    {"nan", 1, {DICTIONARY_DIRECTIONAL}, 5126},
     {"dōng nán", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"xī nán", 1, {DICTIONARY_DIRECTIONAL}, -1},
-    {"區", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"bei", 1, {DICTIONARY_DIRECTIONAL}, 5124},
     {"cūn dào", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"lóu", 1, {DICTIONARY_LEVEL_NUMBERED}, -1},
-    {"lu", 1, {DICTIONARY_STREET_TYPE}, 5148},
+    {"qiao", 1, {DICTIONARY_PLACE_NAME}, 5139},
+    {"lou", 1, {DICTIONARY_LEVEL_NUMBERED}, 5136},
     {"shì", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT_NUMBERED}, -1},
+    {"xiāngdào", 1, {DICTIONARY_STREET_TYPE}, 5163},
     {"村道", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"nòng", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"市", 1, {DICTIONARY_QUALIFIER}, -1},
     {"xiāng", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"xiang dao", 1, {DICTIONARY_STREET_TYPE}, 5152},
     {"区", 1, {DICTIONARY_QUALIFIER}, -1},
-    {"zhen", 1, {DICTIONARY_QUALIFIER}, 5135},
+    {"xiang", 1, {DICTIONARY_STREET_TYPE}, 5162},
     {"郵政信箱", 1, {DICTIONARY_POST_OFFICE}, -1}
 };
 
 address_language_index_t expansion_languages[] = {
     {"af", 0, 210},
-    {"all", 210, 59901},
-    {"ar", 60111, 16},
-    {"ast", 60127, 8},
-    {"az", 60135, 72},
-    {"be", 60207, 165},
-    {"bg", 60372, 171},
-    {"br", 60543, 73},
-    {"bs", 60616, 97},
-    {"ca", 60713, 481},
-    {"cs", 61194, 189},
-    {"cy", 61383, 66},
-    {"da", 61449, 177},
-    {"de", 61626, 796},
-    {"el", 62422, 339},
-    {"en", 62761, 3458},
-    {"es", 66219, 2194},
-    {"et", 68413, 202},
-    {"eu", 68615, 149},
-    {"fa", 68764, 16},
-    {"fi", 68780, 108},
-    {"fil", 68888, 3},
-    {"fr", 68891, 1575},
-    {"ga", 70466, 180},
-    {"gd", 70646, 104},
-    {"gl", 70750, 118},
-    {"gsw", 70868, 19},
-    {"he", 70887, 26},
-    {"hi", 70913, 4},
-    {"hr", 70917, 102},
-    {"hu", 71019, 108},
-    {"id", 71127, 92},
-    {"is", 71219, 95},
-    {"it", 71314, 1820},
-    {"ja", 73134, 276},
-    {"ka", 73410, 27},
-    {"ko", 73437, 52},
-    {"lb", 73489, 3},
-    {"lt", 73492, 77},
-    {"lv", 73569, 54},
-    {"ms", 73623, 123},
-    {"mt", 73746, 20},
-    {"nb", 73766, 167},
-    {"nl", 73933, 397},
-    {"oc", 74330, 27},
-    {"pap", 74357, 4},
-    {"pl", 74361, 397},
-    {"pt", 74758, 1207},
-    {"ro", 75965, 137},
-    {"ru", 76102, 540},
-    {"si", 76642, 15},
-    {"sk", 76657, 275},
-    {"sl", 76932, 95},
-    {"sr", 77027, 145},
-    {"sv", 77172, 239},
-    {"ta", 77411, 4},
-    {"th", 77415, 23},
-    {"tr", 77438, 96},
-    {"uk", 77534, 416},
-    {"ur", 77950, 7},
-    {"vi", 77957, 170},
-    {"zh", 78127, 141}
+    {"all", 210, 59905},
+    {"ar", 60115, 16},
+    {"ast", 60131, 8},
+    {"az", 60139, 72},
+    {"be", 60211, 165},
+    {"bg", 60376, 171},
+    {"br", 60547, 73},
+    {"bs", 60620, 97},
+    {"ca", 60717, 481},
+    {"cs", 61198, 189},
+    {"cy", 61387, 66},
+    {"da", 61453, 177},
+    {"de", 61630, 796},
+    {"el", 62426, 339},
+    {"en", 62765, 3459},
+    {"es", 66224, 2195},
+    {"et", 68419, 202},
+    {"eu", 68621, 149},
+    {"fa", 68770, 16},
+    {"fi", 68786, 108},
+    {"fil", 68894, 3},
+    {"fr", 68897, 1575},
+    {"ga", 70472, 180},
+    {"gd", 70652, 104},
+    {"gl", 70756, 118},
+    {"gsw", 70874, 19},
+    {"he", 70893, 26},
+    {"hi", 70919, 4},
+    {"hr", 70923, 102},
+    {"hu", 71025, 108},
+    {"id", 71133, 92},
+    {"is", 71225, 95},
+    {"it", 71320, 1820},
+    {"ja", 73140, 276},
+    {"ka", 73416, 27},
+    {"ko", 73443, 52},
+    {"lb", 73495, 3},
+    {"lt", 73498, 77},
+    {"lv", 73575, 54},
+    {"ms", 73629, 123},
+    {"mt", 73752, 20},
+    {"nb", 73772, 167},
+    {"nl", 73939, 399},
+    {"oc", 74338, 27},
+    {"pap", 74365, 5},
+    {"pl", 74370, 397},
+    {"pt", 74767, 1207},
+    {"ro", 75974, 137},
+    {"ru", 76111, 572},
+    {"si", 76683, 15},
+    {"sk", 76698, 275},
+    {"sl", 76973, 95},
+    {"sr", 77068, 145},
+    {"sv", 77213, 239},
+    {"th", 77452, 23},
+    {"tr", 77475, 96},
+    {"uk", 77571, 416},
+    {"ur", 77987, 7},
+    {"vi", 77994, 170},
+    {"zh", 78164, 141}
 };
diff --git a/src/numex_data.c b/src/numex_data.c
index a6ee58d9..b0a96771 100644
--- a/src/numex_data.c
+++ b/src/numex_data.c
@@ -239,6 +239,60 @@ char *numex_keys[] = {
     "квадрилион",
     "квадрилиона",
     "и",
+    "nula",
+    "jedan",
+    "jedinica",
+    "jedno",
+    "dva",
+    "dve",
+    "tri",
+    "četiri",
+    "cetiri",
+    "pet",
+    "šest",
+    "sest",
+    "sedam",
+    "osam",
+    "devet",
+    "deset",
+    "jedanaest",
+    "dvanaest",
+    "trinaest",
+    "četrnaest",
+    "cetrnaest",
+    "petnaest",
+    "šesnaest",
+    "sesnaest",
+    "sedamnaest",
+    "osamnaest",
+    "devetnaest",
+    "dvadeset",
+    "trideset",
+    "četrdeset",
+    "cetrdeset",
+    "pedeset",
+    "šezdeset",
+    "sezdeset",
+    "sedamdeset",
+    "osamdeset",
+    "devedeset",
+    "sto",
+    "dvesta",
+    "trista",
+    "četiristo",
+    "cetiristo",
+    "petsto",
+    "šeststo",
+    "seststo",
+    "sedamsto",
+    "osamsto",
+    "devetsto",
+    "hiljada",
+    "milion",
+    "miliard",
+    "bilion",
+    "biliard",
+    "i",
     "zero",
     "un",
     "una",
@@ -513,18 +567,52 @@ char *numex_keys[] = {
     "halvfjerds",
     "firs",
     "halvfems",
-    "et­hundrede",
-    "hundred",
-    "et tusinde",
+    "hundrede",
+    "tusinde",
     "tusind",
-    "en million",
+    "million",
     "millioner",
-    "en milliard",
+    "milliard",
     "milliarder",
-    "en billion",
+    "billion",
     "billioner",
-    "en billiard",
+    "billiard",
     "billiarder",
+    "nulte",
+    "første",
+    "foerste",
+    "anden",
+    "tredje",
+    "fjerde",
+    "femte",
+    "sjette",
+    "syvende",
+    "ottende",
+    "niende",
+    "tiende",
+    "ellevte",
+    "tolvte",
+    "trettende",
+    "fjortende",
+    "femtende",
+    "sekstende",
+    "syttende",
+    "attende",
+    "nittende",
+    "tyvende",
+    "tredivte",
+    "fyrrende",
+    "halvtredsindstyvende",
+    "tresindstyvende",
+    "halvfjerdsindstyvende",
+    "firsindstyvende",
+    "halvfemsindstyvende",
+    "hundredede",
+    "tusinde",
+    "millionte",
+    "milliardte",
+    "billionte",
+    "billiardte",
     "og",
     "null",
     "eins",
@@ -1229,6 +1317,17 @@ char *numex_keys[] = {
     "diecinueve",
     "veinte",
     "veintiun",
+    "veintidós",
+    "veintidos",
+    "veintitrés",
+    "veintitres",
+    "veinticuatro",
+    "veinticinco",
+    "veintiséis",
+    "veintiseis",
+    "veintisiete",
+    "veintiocho",
+    "veintinueve",
     "treinta",
     "cuarenta",
     "cincuenta",
@@ -1514,23 +1613,32 @@ char *numex_keys[] = {
     "quatorze",
     "quinze",
     "seize",
+    "dix-sept",
     "dix sept",
+    "dix-huit",
     "dix huit",
     "dixhuit",
+    "dix-neuf",
     "dix neuf",
     "dixneuf",
     "vingt",
+    "vingt-et-un",
     "trente",
+    "trente-et-un",
     "quarante",
+    "quarante-et-un",
     "cinquante",
+    "cinquante-et-un",
     "soixante",
     "septante",
     "huitante",
-    "octante",
+    "quatre-vingt",
+    "quatre-vingt",
+    "quatrevingt",
+    "quatre-vingts",
     "quatre vingts",
     "quatrevingts",
-    "quatre vingt",
-    "quatrevingt",
+    "octante",
     "nonante",
     "cent",
     "cents",
@@ -1966,6 +2074,7 @@ char *numex_keys[] = {
     "egy",
     "kettő",
     "ketto",
+    "két",
     "ket",
     "három",
     "harom",
@@ -2545,10 +2654,10 @@ char *numex_keys[] = {
     "sytten",
     "atten",
     "nitten",
-    "tyve",
-    "tredve",
-    "førr",
-    "forr",
+    "tjue",
+    "tretti",
+    "førti",
+    "forti",
     "femti",
     "seksti",
     "søtti",
@@ -2558,7 +2667,8 @@ char *numex_keys[] = {
     "nitti",
     "etthundre",
     "hundre",
-    "tusend",
+    "etttusen",
+    "tusen",
     "million",
     "millioner",
     "milliard",
@@ -2567,6 +2677,44 @@ char *numex_keys[] = {
     "billioner",
     "biliard",
     "biliarder",
+    "nullte",
+    "første",
+    "forste",
+    "andre",
+    "tredje",
+    "fjerde",
+    "femte",
+    "sjette",
+    "sjuende",
+    "åttende",
+    "aattende",
+    "niende",
+    "tiende",
+    "ellevte",
+    "tolvte",
+    "trettende",
+    "fjortende",
+    "femtende",
+    "sekstende",
+    "syttende",
+    "attende",
+    "nittende",
+    "nittende",
+    "tjueende",
+    "trettiende",
+    "førtiende",
+    "femtiende",
+    "sekstiende",
+    "syttiende",
+    "åttiende",
+    "nittiende",
+    "nittiende",
+    "hundrede",
+    "tusende",
+    "millionte",
+    "milliardte",
+    "billionte",
+    "billiardte",
     "og",
     "nul",
     "een",
@@ -2589,13 +2737,29 @@ char *numex_keys[] = {
     "achttien",
     "negentien",
     "twintig",
+    "twee­ën­twintig",
+    "drie­ën­twintig",
     "dertig",
+    "twee­ën­dertig",
+    "drie­ën­dertig",
     "veertig",
+    "twee­ën­veertig",
+    "drie­ën­veertig",
     "vijftig",
+    "twee­ën­vijftig",
+    "drie­ën­vijftig",
     "zestig",
+    "twee­ën­zestig",
+    "drie­ën­zestig",
     "zeventig",
+    "twee­ën­zeventig",
+    "drie­ën­zeventig",
     "tachtig",
+    "twee­ën­tachtig",
+    "drie­ën­tachtig",
     "negentig",
+    "twee­ën­negentig",
+    "drie­ën­negentig",
     "honderd",
     "duizend",
     "miljoen",
@@ -2622,6 +2786,8 @@ char *numex_keys[] = {
     "achttiende",
     "negentiende",
     "twintigste",
+    "twintigste",
+    "twintigste",
     "dertigste",
     "veerigste",
     "vijftigste",
@@ -2944,7 +3110,6 @@ char *numex_keys[] = {
     "ноль",
     "один",
     "одна",
-    "одной",
     "одно",
     "два",
     "две",
@@ -3264,20 +3429,217 @@ char *numex_keys[] = {
     "bilijuny",
     "biliarda",
     "biliardy",
+    "нула",
+    "nula",
+    "један",
+    "jedan",
+    "једна",
+    "jedna",
+    "једно",
+    "jedno",
+    "два",
+    "dva",
+    "две",
+    "dve",
+    "три",
+    "tri",
+    "четири",
+    "četiri",
+    "cetiri",
+    "пет",
+    "pet",
+    "шест",
+    "šest",
+    "sest",
+    "седам",
+    "sedam",
+    "осам",
+    "osam",
+    "девет",
+    "devet",
+    "десет",
+    "deset",
+    "једанаест",
+    "jedanaest",
+    "дванаест",
+    "dvanaest",
+    "тринаест",
+    "trinaest",
+    "четрнаест",
+    "četrnaest",
+    "cetrnaest",
+    "петнаест",
+    "petnaest",
+    "шеснаест",
+    "šesnaest",
+    "sesnaest",
+    "седамнаест",
+    "sedamnaest",
+    "осамнаест",
+    "osamnaest",
+    "деветнаест",
+    "devetnaest",
+    "двадесет",
+    "dvadeset",
+    "тридесет",
+    "trideset",
+    "четрдесет",
+    "četrdeset",
+    "cetrdeset",
+    "педесет",
+    "pedeset",
+    "шездесет",
+    "šezdeset",
+    "sezdeset",
+    "седамдесет",
+    "sedamdeset",
+    "осамдесет",
+    "osamdeset",
+    "деведесет",
+    "devedeset",
+    "сто",
+    "sto",
+    "двеста",
+    "dvesta",
+    "триста",
+    "trista",
+    "четиристо",
+    "četiristo",
+    "cetiristo",
+    "петсто",
+    "petsto",
+    "шестсто",
+    "šeststo",
+    "seststo",
+    "седамсто",
+    "sedamsto",
+    "осамсто",
+    "osamsto",
+    "деветсто",
+    "devetsto",
+    "хиљаду",
+    "hiljadu",
+    "хиљаде",
+    "hiljade",
+    "хиљада",
+    "hiljada",
+    "милион",
+    "milion",
+    "милиона",
+    "miliona",
+    "милијарду",
+    "milijardu",
+    "милијарде",
+    "milijarde",
+    "милијарди",
+    "milijardi",
+    "билион",
+    "bilion",
+    "билиона",
+    "biliona",
+    "билијарда",
+    "bilijarda",
+    "билијарде",
+    "bilijarde",
+    "билијарди",
+    "bilijardi",
+    "нулте",
+    "nulte",
+    "први",
+    "prvi",
+    "други",
+    "drugi",
+    "трећи",
+    "treći",
+    "treci",
+    "четврти",
+    "četvrti",
+    "cetvrti",
+    "пети",
+    "peti",
+    "шести",
+    "šesti",
+    "sesti",
+    "седми",
+    "sedmi",
+    "осми",
+    "osmi",
+    "девети",
+    "deveti",
+    "десети",
+    "deseti",
+    "једанаести",
+    "jedanaesti",
+    "дванаести",
+    "dvanaesti",
+    "тринаести",
+    "trinaesti",
+    "четрнаести",
+    "četrnaesti",
+    "cetrnaesti",
+    "петнаести",
+    "petnaesti",
+    "шеснаести",
+    "šesnaesti",
+    "sesnaesti",
+    "седамнаести",
+    "sedamnaesti",
+    "осамнаести",
+    "osamnaesti",
+    "деветнаести",
+    "devetnaesti",
+    "двадесети",
+    "dvadeseti",
+    "тридесети",
+    "trideseti",
+    "четрдесети",
+    "četrdeseti",
+    "cetrdeseti",
+    "педесети",
+    "pedeseti",
+    "шездесети",
+    "šezdeseti",
+    "sezdeseti",
+    "седамдесети",
+    "sedamdeseti",
+    "осамдесетица",
+    "osamdeseti",
+    "деведесетина",
+    "devedeseti",
+    "стоти",
+    "stoti",
+    "двестати",
+    "dvestati",
+    "тристати",
+    "tristati",
+    "четиристоти",
+    "četristoti",
+    "cetristoti",
+    "петстоти",
+    "petstoti",
+    "шестстоти",
+    "šeststoti",
+    "seststoti",
+    "седамстоти",
+    "sedamstoti",
+    "осамстоти",
+    "osamstoti",
+    "деветстоти",
+    "devetstoti",
     "noll",
-    "et",
+    "en",
     "ett",
     "två",
-    "tva",
     "tvaa",
+    "tva",
     "tre",
     "fyra",
     "fem",
     "sex",
     "sju",
     "åtta",
-    "atta",
     "aatta",
+    "atta",
     "nio",
     "tio",
     "elva",
@@ -3296,19 +3658,20 @@ char *numex_keys[] = {
     "sextio",
     "sjuttio",
     "åttio",
-    "attio",
     "aattio",
+    "attio",
     "nittio",
+    "etthundra",
     "hundra",
     "ettusen",
     "tusen",
-    "en miljon",
+    "miljon",
     "miljoner",
-    "en miljard",
+    "miljard",
     "miljarder",
-    "en biljon",
+    "biljon",
     "biljoner",
-    "en biljard",
+    "biljard",
     "biljarder",
     "nollte",
     "första",
@@ -3329,8 +3692,8 @@ char *numex_keys[] = {
     "sjaette",
     "sjunde",
     "åttonde",
-    "attonde",
     "aattonde",
+    "attonde",
     "nionde",
     "tionde",
     "elfte",
@@ -3349,8 +3712,8 @@ char *numex_keys[] = {
     "sextionde",
     "sjuttionde",
     "åttionde",
-    "attionde",
     "aattionde",
+    "attionde",
     "nittionde",
     "hundrade",
     "tusende",
@@ -3506,6 +3869,7 @@ char *numex_keys[] = {
     "більярд",
     "більярди",
     "більярдів",
+    "і",
     "〇",
     "零",
     "一",
@@ -3784,6 +4148,60 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NEUTER, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 5LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 7LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 8LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 9LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 10LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 11LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 12LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 13LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 200LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 300LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 500LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 700LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 800LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 900LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    NUMEX_STOPWORD_RULE,
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 1LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 2LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
@@ -4047,26 +4465,60 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NEUTER, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
-    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 5LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 7LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 8LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 9LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 10LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 11LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 12LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 13LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
     NUMEX_STOPWORD_RULE,
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
@@ -4771,6 +5223,17 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 21LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 22LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 22LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 23LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 23LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 24LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 25LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 26LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 26LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 27LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 28LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 29LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
@@ -4781,21 +5244,21 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 200LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 200LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 300LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 200LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 300LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 300LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 500LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 400LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 500LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 500LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 700LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 600LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 700LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 700LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 800LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 800LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 900LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 800LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 900LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 900LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
@@ -5057,22 +5520,31 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 21LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 31LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 41LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 51LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 60LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
@@ -5509,6 +5981,7 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
@@ -6087,20 +6560,21 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
-    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
@@ -6109,6 +6583,44 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 5LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 7LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 8LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 8LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 9LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 10LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 11LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 12LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 13LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
     NUMEX_STOPWORD_RULE,
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
@@ -6131,14 +6643,30 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 22LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 23LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 32LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 33LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 42LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 43LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 52LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 53LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 62LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 72LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 73LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 82LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 83LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
-    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 92LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 93LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
@@ -6165,6 +6693,8 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
@@ -6173,10 +6703,10 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_ADD, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
-    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
-    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
-    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
-    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
     NUMEX_STOPWORD_RULE,
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
@@ -6363,7 +6893,7 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 800LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 900LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 900LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
@@ -6486,7 +7016,6 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 1LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 1LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NEUTER, CATEGORY_DEFAULT, 10, 1LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 2LL},
@@ -6807,6 +7336,203 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NEUTER, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NEUTER, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_FEMININE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 5LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 5LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 7LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 7LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 8LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 8LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 9LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 9LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 10LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 10LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 11LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 11LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 12LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 12LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 13LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 13LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 200LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 200LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 300LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 300LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 500LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 500LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 700LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 700LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 800LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 800LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 900LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 900LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 3LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 4LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 5LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 5LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 6LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 7LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 7LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 8LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 8LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 9LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 9LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 10LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 10LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 11LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 11LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 12LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 12LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 13LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 13LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 200LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 200LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 300LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 300LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 400LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 500LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 500LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 600LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 700LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 700LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 800LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 800LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 900LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 900LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 2LL},
@@ -6841,6 +7567,7 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
@@ -6877,25 +7604,25 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 10LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 11LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 12LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 13LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
-    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
-    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
-    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 13LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 14LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 15LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 16LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 17LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 18LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 19LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 20LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL},
+    {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 90LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 100LL},
+    {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_ORDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000LL},
@@ -7048,6 +7775,7 @@ numex_rule_t numex_rules[] = {
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
     {NUMEX_LEFT_CONTEXT_MULTIPLY, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1000000000000000LL},
+    NUMEX_STOPWORD_RULE,
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 0LL},
     {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_NONE, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 1LL},
@@ -7084,280 +7812,301 @@ numex_rule_t numex_rules[] = {
 };
 
 ordinal_indicator_t ordinal_indicator_rules[] = {
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ы"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "-ы"},
     {"13", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
     {"13", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
     {"13", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
     {"13", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "ое"},
-    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "-ое"},
-    {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "яе"},
-    {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "-яе"},
-    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"10", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"10", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"10", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"10", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"12", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"12", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"12", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"12", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
     {"13", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
     {"13", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
     {"13", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
     {"13", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"80", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"80", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"80", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"80", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"20", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"20", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"20", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"20", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"90", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"90", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"90", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"90", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"30", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"30", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"30", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"30", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"70", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"70", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"70", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"70", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"40", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"40", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"40", GENDER_NEUTER, CATEGORY_DEFAULT, "ое"},
-    {"40", GENDER_NEUTER, CATEGORY_DEFAULT, "-ое"},
-    {"50", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"50", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"50", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
-    {"50", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
     {"60", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
     {"60", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
     {"60", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
     {"60", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "è"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, "r"},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, "er"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "n"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "on"},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, "r"},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, "er"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "t"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "rt"},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, "è"},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "è"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, "è"},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "è"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, "è"},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"70", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"70", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"70", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"70", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"90", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"90", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"90", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"90", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"80", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"80", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"80", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"80", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"10", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"10", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"10", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"10", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"00", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"00", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"00", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"00", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"12", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"12", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"12", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"12", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"20", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"20", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"20", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"20", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"30", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"30", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"30", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"30", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"50", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"50", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"50", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"50", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"40", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"40", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"40", GENDER_NEUTER, CATEGORY_DEFAULT, "ое"},
+    {"40", GENDER_NEUTER, CATEGORY_DEFAULT, "-ое"},
+    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "ое"},
+    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "-ое"},
+    {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "яе"},
+    {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "-яе"},
+    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "ое"},
+    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "-ое"},
+    {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "ае"},
+    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "-ае"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"11", GENDER_NONE, CATEGORY_DEFAULT, "è"},
     {"11", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"12", GENDER_NONE, CATEGORY_DEFAULT, "è"},
-    {"12", GENDER_NONE, CATEGORY_DEFAULT, "e"},
     {"13", GENDER_NONE, CATEGORY_DEFAULT, "è"},
     {"13", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"12", GENDER_NONE, CATEGORY_DEFAULT, "è"},
+    {"12", GENDER_NONE, CATEGORY_DEFAULT, "e"},
     {"14", GENDER_NONE, CATEGORY_DEFAULT, "è"},
     {"14", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "r"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "er"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "è"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "r"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "er"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "n"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "on"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "è"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "t"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "rt"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "è"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "è"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "è"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "è"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "e"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ra"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "era"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ος"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ός"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ης"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
     {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ή"},
     {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
     {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
     {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
     {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
     {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "η"},
+    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
     {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "ό"},
     {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
-    {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
-    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
     {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
-    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
+    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
     {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
-    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
+    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
     {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
-    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
+    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
     {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "th"},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, "st"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "nd"},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, "rd"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "th"},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, "th"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "th"},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, "th"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "th"},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, "th"},
+    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "ο"},
     {"11", GENDER_NONE, CATEGORY_DEFAULT, "th"},
-    {"12", GENDER_NONE, CATEGORY_DEFAULT, "th"},
     {"13", GENDER_NONE, CATEGORY_DEFAULT, "th"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"12", GENDER_NONE, CATEGORY_DEFAULT, "th"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "st"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "th"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "rd"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "nd"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "th"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "th"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "th"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "th"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "th"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "th"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "ᵉʳ"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "er"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "r"},
@@ -7365,9 +8114,9 @@ ordinal_indicator_t ordinal_indicator_rules[] = {
     {"1", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "ᵉʳ"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "er"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "r"},
@@ -7375,308 +8124,298 @@ ordinal_indicator_t ordinal_indicator_rules[] = {
     {"3", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, ".º"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ra"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "era"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"3", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
     {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "ra"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"5", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
     {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"7", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
     {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"9", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
     {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, ":nen"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, ":nen"},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
-    {"11", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
-    {"12", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
-    {"13", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
-    {"14", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
-    {"15", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
-    {"16", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
-    {"17", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
-    {"18", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
-    {"19", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, "er"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "d"},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"11", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"81", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"21", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"91", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"31", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"41", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"71", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"51", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"61", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"0", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"1", GENDER_NONE, CATEGORY_PLURAL, "ers"},
-    {"2", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"2", GENDER_NONE, CATEGORY_PLURAL, "ds"},
-    {"3", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"4", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"5", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"6", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"7", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"8", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"9", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"11", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"81", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"21", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"91", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"31", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"41", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"71", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"51", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"61", GENDER_NONE, CATEGORY_PLURAL, "es"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "re"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "de"},
-    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"11", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"81", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"21", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"91", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"31", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"41", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"71", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"51", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"61", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
-    {"0", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"1", GENDER_FEMININE, CATEGORY_PLURAL, "res"},
-    {"2", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"2", GENDER_FEMININE, CATEGORY_PLURAL, "des"},
-    {"3", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"4", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"5", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"6", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"7", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"8", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"9", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"11", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"81", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"21", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"91", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"31", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"41", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"71", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"51", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"61", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, ".ª"},
     {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"11", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
+    {"11", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"13", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
+    {"13", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"12", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
+    {"12", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"15", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
+    {"15", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"14", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
+    {"14", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"17", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
+    {"17", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"16", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
+    {"16", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"19", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
+    {"19", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"18", GENDER_NONE, CATEGORY_DEFAULT, ":sta"},
+    {"18", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, ":nen"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, ":nen"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, ":s"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"61", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"71", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"91", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"81", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"11", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"21", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"31", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"51", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"41", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "er"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "d"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"61", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"71", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"91", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"81", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"11", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"21", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"31", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"51", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"41", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"1", GENDER_NONE, CATEGORY_PLURAL, "ers"},
+    {"0", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"3", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"2", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"2", GENDER_NONE, CATEGORY_PLURAL, "ds"},
+    {"5", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"4", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"7", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"6", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"9", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"8", GENDER_NONE, CATEGORY_PLURAL, "es"},
+    {"61", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"71", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"91", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"81", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"11", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"21", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"31", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"51", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"41", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "re"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "de"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "e"},
+    {"61", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"71", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"91", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"81", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"11", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"21", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"31", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"51", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"41", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"1", GENDER_FEMININE, CATEGORY_PLURAL, "res"},
+    {"0", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"3", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"2", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"2", GENDER_FEMININE, CATEGORY_PLURAL, "des"},
+    {"5", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"4", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"7", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"6", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"9", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"8", GENDER_FEMININE, CATEGORY_PLURAL, "es"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"1", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"3", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"5", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"7", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"9", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"10", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"10", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"11", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"11", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"12", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"12", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"13", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"13", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"14", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"14", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"15", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"15", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"16", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"16", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"17", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"17", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"18", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"18", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"19", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"19", GENDER_NONE, CATEGORY_DEFAULT, "de"},
-    {"21", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"21", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"22", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"22", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"23", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"23", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"24", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"24", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"25", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"25", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"26", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"26", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"27", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"27", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"28", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"28", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"29", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"29", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"31", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"31", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"32", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"32", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"33", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"33", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"34", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"34", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"35", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"35", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"36", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"36", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"37", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"37", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"38", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"38", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"39", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"39", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"41", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"41", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"42", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"42", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"43", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"43", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"44", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"44", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"45", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"45", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"46", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"46", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"47", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"47", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"48", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"48", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"49", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"49", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"51", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"51", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"52", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"52", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"53", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"53", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"54", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"54", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"55", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"55", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"56", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"56", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"57", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"57", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"58", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"58", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"59", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"59", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"61", GENDER_NONE, CATEGORY_DEFAULT, "e"},
     {"61", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
     {"62", GENDER_NONE, CATEGORY_DEFAULT, "e"},
@@ -7695,252 +8434,408 @@ ordinal_indicator_t ordinal_indicator_rules[] = {
     {"68", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
     {"69", GENDER_NONE, CATEGORY_DEFAULT, "e"},
     {"69", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"71", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"71", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"72", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"72", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"73", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"73", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"74", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"74", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"75", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"75", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"76", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"76", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"77", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"77", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"78", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"78", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"79", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"79", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"81", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"81", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"82", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"82", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"83", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"83", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"84", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"84", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"85", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"85", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"86", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"86", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"87", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"87", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"24", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"24", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"25", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"25", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"26", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"26", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"27", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"27", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"21", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"21", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"22", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"22", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"23", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"23", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"28", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"28", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"29", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"29", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"99", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"99", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"98", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"98", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"91", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"91", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"15", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"15", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"93", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"93", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"92", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"92", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"95", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"95", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"94", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"94", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"97", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"97", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"96", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"96", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"11", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"11", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"10", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"10", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"13", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"13", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"12", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"12", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"59", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"59", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"58", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"58", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"17", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"17", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"16", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"16", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"55", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"55", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"54", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"54", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"57", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"57", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"56", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"56", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"51", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"51", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"53", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"53", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"52", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"52", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"19", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"19", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"18", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"18", GENDER_NONE, CATEGORY_DEFAULT, "de"},
     {"88", GENDER_NONE, CATEGORY_DEFAULT, "e"},
     {"88", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
     {"89", GENDER_NONE, CATEGORY_DEFAULT, "e"},
     {"89", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"91", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"91", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"92", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"92", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"93", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"93", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"94", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"94", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"95", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"95", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"96", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"96", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"97", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"97", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"98", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"98", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"99", GENDER_NONE, CATEGORY_DEFAULT, "e"},
-    {"99", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"82", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"82", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"83", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"83", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"81", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"81", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"86", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"86", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"87", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"87", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"84", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"84", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"85", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"85", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"48", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"48", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"49", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"49", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"46", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"46", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"47", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"47", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"44", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"44", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"45", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"45", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"42", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"42", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"43", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"43", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"41", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"41", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"77", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"77", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"76", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"76", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"75", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"75", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"74", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"74", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"73", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"73", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"72", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"72", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"71", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"71", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"79", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"79", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"78", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"78", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"39", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"39", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"38", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"38", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"14", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"14", GENDER_NONE, CATEGORY_DEFAULT, "de"},
+    {"33", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"33", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"32", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"32", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"31", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"31", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"37", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"37", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"36", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"36", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"35", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"35", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
+    {"34", GENDER_NONE, CATEGORY_DEFAULT, "e"},
+    {"34", GENDER_NONE, CATEGORY_DEFAULT, "ste"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "º"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "o"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "º"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "o"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "º"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "o"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
     {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "й"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "ª"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "a"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "й"},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "й"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "й"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "й"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "й"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "й"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "й"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "й"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "й"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
-    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
-    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
-    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
     {"13", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
     {"13", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
     {"13", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
     {"13", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
-    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"1", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"0", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"3", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"2", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"5", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"4", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"7", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"6", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"9", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "я"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "-я"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "ая"},
+    {"8", GENDER_FEMININE, CATEGORY_DEFAULT, "-ая"},
+    {"13", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"13", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
     {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
     {"1", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"0", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
     {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
     {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
     {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "ье"},
     {"3", GENDER_NEUTER, CATEGORY_DEFAULT, "-ье"},
-    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"2", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
     {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
     {"5", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"4", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
     {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
     {"7", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"6", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
     {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
     {"9", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"13", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
-    {"13", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
-    {"0", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
+    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "е"},
+    {"8", GENDER_NEUTER, CATEGORY_DEFAULT, "-е"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "."},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "."},
     {"1", GENDER_NONE, CATEGORY_DEFAULT, ":a"},
-    {"2", GENDER_NONE, CATEGORY_DEFAULT, ":a"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
     {"3", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
-    {"4", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, ":a"},
     {"5", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
-    {"6", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
     {"7", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
-    {"8", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
     {"9", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
-    {"0", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, ":e"},
     {"1", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
-    {"2", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
+    {"0", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
     {"3", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
-    {"4", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
+    {"2", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
     {"5", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
-    {"6", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
+    {"4", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
     {"7", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
+    {"6", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
+    {"9", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
     {"8", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"},
-    {"9", GENDER_MASCULINE, CATEGORY_DEFAULT, ":e"}
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"1", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"0", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"3", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"2", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"5", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"4", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"7", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"6", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"9", GENDER_NONE, CATEGORY_DEFAULT, "-й"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "й"},
+    {"8", GENDER_NONE, CATEGORY_DEFAULT, "-й"}
 };
 
 numex_language_source_t numex_languages[] = {
-    {"be", 1, 0, 189, 0, 146},
-    {"bg", 1, 189, 50, 146, 0},
-    {"ca", 1, 239, 141, 146, 40},
-    {"cs", 1, 380, 81, 186, 0},
-    {"cy", 1, 461, 23, 186, 0},
-    {"da", 1, 484, 42, 186, 10},
-    {"de", 1, 526, 194, 196, 10},
-    {"el", 1, 720, 416, 206, 52},
-    {"en", 1, 1136, 70, 258, 13},
-    {"es", 1, 1206, 133, 271, 71},
-    {"et", 1, 1339, 49, 342, 0},
-    {"fi", 1, 1388, 107, 342, 19},
-    {"fr", 1, 1495, 193, 361, 80},
-    {"ga", 1, 1688, 86, 441, 0},
-    {"hr", 1, 1774, 188, 441, 0},
-    {"hu", 1, 1962, 66, 441, 0},
-    {"it", 1, 2028, 163, 441, 40},
-    {"ja", 0, 2191, 18, 481, 0},
-    {"ko", 0, 2209, 18, 481, 0},
-    {"la", 1, 2227, 31, 481, 0},
-    {"lt", 1, 2258, 69, 481, 0},
-    {"lv", 1, 2327, 102, 481, 0},
-    {"mt", 1, 2429, 93, 481, 0},
-    {"nb", 1, 2522, 46, 481, 0},
-    {"nl", 1, 2568, 68, 481, 184},
-    {"pl", 1, 2636, 82, 665, 10},
-    {"pt", 1, 2718, 170, 675, 40},
-    {"ro", 1, 2888, 53, 715, 0},
-    {"ru", 1, 2941, 192, 715, 86},
-    {"sk", 1, 3133, 72, 801, 0},
-    {"sl", 1, 3205, 59, 801, 0},
-    {"sv", 1, 3264, 95, 801, 20},
-    {"tr", 1, 3359, 70, 821, 0},
-    {"uk", 1, 3429, 77, 821, 0},
-    {"zh", 0, 3506, 33, 821, 0}
+    {"be", 1, 0, 189, 0, 150},
+    {"bg", 1, 189, 50, 150, 0},
+    {"bs", 1, 239, 54, 150, 10},
+    {"ca", 1, 293, 141, 160, 40},
+    {"cs", 1, 434, 81, 200, 10},
+    {"cy", 1, 515, 23, 210, 0},
+    {"da", 1, 538, 76, 210, 10},
+    {"de", 1, 614, 194, 220, 10},
+    {"el", 1, 808, 416, 230, 52},
+    {"en", 1, 1224, 70, 282, 13},
+    {"es", 1, 1294, 144, 295, 71},
+    {"et", 1, 1438, 49, 366, 10},
+    {"eu", 0, 1487, 0, 376, 10},
+    {"fi", 1, 1487, 107, 386, 38},
+    {"fr", 1, 1594, 202, 424, 80},
+    {"ga", 1, 1796, 86, 504, 0},
+    {"hr", 1, 1882, 188, 504, 10},
+    {"hu", 1, 2070, 67, 514, 10},
+    {"is", 0, 2137, 0, 524, 10},
+    {"it", 1, 2137, 163, 534, 40},
+    {"ja", 0, 2300, 18, 574, 0},
+    {"ko", 0, 2318, 18, 574, 0},
+    {"la", 1, 2336, 31, 574, 0},
+    {"lt", 1, 2367, 69, 574, 10},
+    {"lv", 1, 2436, 102, 584, 10},
+    {"mt", 1, 2538, 93, 594, 0},
+    {"nb", 1, 2631, 85, 594, 10},
+    {"nl", 1, 2716, 86, 604, 184},
+    {"pl", 1, 2802, 82, 788, 10},
+    {"pt", 1, 2884, 170, 798, 40},
+    {"ro", 1, 3054, 53, 838, 0},
+    {"ru", 1, 3107, 192, 838, 86},
+    {"sk", 1, 3298, 72, 924, 10},
+    {"sl", 1, 3370, 59, 934, 0},
+    {"sr", 1, 3429, 197, 934, 10},
+    {"sv", 1, 3626, 96, 944, 20},
+    {"tr", 1, 3722, 70, 964, 0},
+    {"uk", 1, 3792, 78, 964, 20},
+    {"zh", 0, 3870, 33, 984, 0}
 };