diff --git a/src/address_expansion_data.c b/src/address_expansion_data.c
index 6cf1d6bf..1c942c5d 100644
--- a/src/address_expansion_data.c
+++ b/src/address_expansion_data.c
@@ -71480,6 +71480,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"escritora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"excmo", 1, {DICTIONARY_PERSONAL_TITLE}, 2026},
     {"gobernador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"b°", 1, {DICTIONARY_QUALIFIER}, 2236},
     {"secto", 1, {DICTIONARY_PERSONAL_TITLE}, 2081},
     {"saica", 1, {DICTIONARY_COMPANY_TYPE}, 1909},
     {"jardín de infancia", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -71488,8 +71489,10 @@ address_expansion_rule_t expansion_rules[] = {
     {"enfermeria", 1, {DICTIONARY_PLACE_NAME}, 2152},
     {"blque", 1, {DICTIONARY_QUALIFIER}, 2238},
     {"baronesa", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"sinaloa", 1, {DICTIONARY_TOPONYM}, -1},
     {"so", 1, {DICTIONARY_TOPONYM}, 2442},
     {"sto", 1, {DICTIONARY_PERSONAL_TITLE}, 2074},
+    {"n.°", 1, {DICTIONARY_NUMBER}, 1976},
     {"núm ext", 1, {DICTIONARY_HOUSE_NUMBER}, 1957},
     {"sotano", 1, {DICTIONARY_LEVEL_BASEMENT}, 1958},
     {"arzobispo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
@@ -71527,6 +71530,8 @@ address_expansion_rule_t expansion_rules[] = {
     {"zoológico", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"cmo", 1, {DICTIONARY_STREET_TYPE}, 2292},
     {"jr", 1, {DICTIONARY_PERSONAL_SUFFIX}, 1977},
+    {"cto juvenil", 1, {DICTIONARY_PLACE_NAME}, 2130},
+    {"vla", 1, {DICTIONARY_PLACE_NAME}, 2223},
     {"blq", 1, {DICTIONARY_QUALIFIER}, 2238},
     {"pe", 1, {DICTIONARY_PERSONAL_TITLE}, 2059},
     {"s.c", 1, {DICTIONARY_COMPANY_TYPE}, 1913},
@@ -71549,6 +71554,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"d n", 1, {DICTIONARY_TOPONYM}, 2417},
     {"joyería", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"septiembre", 1, {DICTIONARY_SYNONYM}, -1},
+    {"nrº", 1, {DICTIONARY_NUMBER}, 1976},
     {"mansion", 1, {DICTIONARY_PLACE_NAME}, 2184},
     {"chalet", 1, {DICTIONARY_BUILDING_TYPE}, -1},
     {"fco", 1, {DICTIONARY_GIVEN_NAME}, 1954},
@@ -71589,7 +71595,8 @@ address_expansion_rule_t expansion_rules[] = {
     {"atico lujo", 1, {DICTIONARY_UNIT_STANDALONE}, 2462},
     {"nr in", 1, {DICTIONARY_UNIT_NUMBERED}, 2457},
     {"lópez", 1, {DICTIONARY_SURNAME}, -1},
-    {"pdte", 1, {DICTIONARY_PERSONAL_TITLE}, 2062},
+    {"n° ext", 1, {DICTIONARY_HOUSE_NUMBER}, 1957},
+    {"sociedad anónima inscrita de capital abierto", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"palacio", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"iglas", 1, {DICTIONARY_PLACE_NAME}, 2174},
     {"martínez", 1, {DICTIONARY_SURNAME}, -1},
@@ -71694,7 +71701,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"droguería", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ctro deportivo", 1, {DICTIONARY_PLACE_NAME}, 2129},
     {"nacional", 1, {DICTIONARY_SYNONYM}, -1},
-    {"s.r.l", 1, {DICTIONARY_COMPANY_TYPE}, 1920},
+    {"s.n°", 1, {DICTIONARY_NO_NUMBER}, 1975},
     {"av cl", 1, {DICTIONARY_STREET_TYPE}, 2276},
     {"bs.as", 1, {DICTIONARY_TOPONYM}, 2412},
     {"na", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
@@ -71779,6 +71786,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"altura", 1, {DICTIONARY_SYNONYM}, -1},
     {"blvd", 1, {DICTIONARY_STREET_TYPE}, 2282},
     {"santo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"s / n°", 1, {DICTIONARY_NO_NUMBER}, 1975},
     {"dto", 1, {DICTIONARY_UNIT_NUMBERED}, 2455},
     {"msnr", 1, {DICTIONARY_PERSONAL_TITLE}, 2055},
     {"residencial", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},
@@ -71786,13 +71794,13 @@ address_expansion_rule_t expansion_rules[] = {
     {"cafetería", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"jards", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 2178},
     {"nucleo", 1, {DICTIONARY_QUALIFIER}, 2251},
-    {"sinaloa", 1, {DICTIONARY_TOPONYM}, -1},
+    {"st°", 1, {DICTIONARY_PERSONAL_TITLE}, 2074},
     {"enfermería", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"cnvto", 1, {DICTIONARY_PLACE_NAME}, 2144},
     {"cerrada", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"poligono industrial", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 2256},
     {"senor", 1, {DICTIONARY_PERSONAL_TITLE}, 2084},
-    {"vla", 1, {DICTIONARY_PLACE_NAME}, 2223},
+    {"st.°", 1, {DICTIONARY_PERSONAL_TITLE}, 2074},
     {"cnal", 1, {DICTIONARY_PERSONAL_TITLE}, 2000},
     {"juez", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"ministro", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
@@ -71800,6 +71808,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"s.p.a.", 1, {DICTIONARY_COMPANY_TYPE}, 1931},
     {"numr ex", 1, {DICTIONARY_HOUSE_NUMBER}, 1957},
     {"g v", 1, {DICTIONARY_STREET_TYPE}, 2318},
+    {"p°", 1, {DICTIONARY_STREET_TYPE}, 2328},
     {"consejero", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"balnr", 1, {DICTIONARY_PLACE_NAME}, 2112},
     {"d.f", 1, {DICTIONARY_TOPONYM}, 2415},
@@ -71847,6 +71856,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"teniente", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"marzo", 1, {DICTIONARY_SYNONYM}, -1},
     {"galería", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},
+    {"n.° in", 1, {DICTIONARY_UNIT_NUMBERED}, 2457},
     {"sarg ay", 1, {DICTIONARY_PERSONAL_TITLE}, 2076},
     {"licenciado", 2, {DICTIONARY_ACADEMIC_DEGREE, DICTIONARY_PERSONAL_TITLE}, -1},
     {"cstan", 1, {DICTIONARY_STREET_TYPE}, 2311},
@@ -71931,8 +71941,9 @@ address_expansion_rule_t expansion_rules[] = {
     {"agrimensor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"gob.no", 1, {DICTIONARY_SYNONYM}, 2376},
     {"preescolar comunitario", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"zona comercial", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"compañía", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"esquina", 1, {DICTIONARY_CROSS_STREET}, -1},
+    {"sn°", 1, {DICTIONARY_NO_NUMBER}, 1975},
     {"tb", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"sep.e", 1, {DICTIONARY_SYNONYM}, 2406},
     {"sgto", 1, {DICTIONARY_PERSONAL_TITLE}, 2075},
@@ -72113,7 +72124,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"reverendisimo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"y cia sc", 1, {DICTIONARY_COMPANY_TYPE}, 1914},
     {"nacl", 1, {DICTIONARY_SYNONYM}, 2392},
-    {"mar", 1, {DICTIONARY_SYNONYM}, 2387},
+    {"n.° ex", 1, {DICTIONARY_HOUSE_NUMBER}, 1957},
     {"en la esq de", 1, {DICTIONARY_CROSS_STREET}, 1937},
     {"dqsa", 1, {DICTIONARY_PERSONAL_TITLE}, 2021},
     {"san luis potosí", 1, {DICTIONARY_TOPONYM}, -1},
@@ -72149,7 +72160,9 @@ address_expansion_rule_t expansion_rules[] = {
     {"callejuela", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"parti", 1, {DICTIONARY_STREET_TYPE}, 2325},
     {"taller", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"n° int", 1, {DICTIONARY_UNIT_NUMBERED}, 2457},
     {"№ int", 1, {DICTIONARY_UNIT_NUMBERED}, 2457},
+    {"nr.°", 1, {DICTIONARY_NUMBER}, 1976},
     {"s coop", 1, {DICTIONARY_COMPANY_TYPE}, 1916},
     {"rt", 1, {DICTIONARY_STREET_TYPE}, 2339},
     {"hermanos", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
@@ -72161,7 +72174,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"secta", 1, {DICTIONARY_PERSONAL_TITLE}, 2082},
     {"n.º in", 1, {DICTIONARY_UNIT_NUMBERED}, 2457},
     {"doctor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"cto juvenil", 1, {DICTIONARY_PLACE_NAME}, 2130},
+    {"n°", 1, {DICTIONARY_NUMBER}, 1976},
     {"ferrocarriles", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"pblo", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2207},
     {"át", 2, {DICTIONARY_UNIT_NUMBERED, DICTIONARY_UNIT_STANDALONE}, 2453},
@@ -72353,7 +72366,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"rpla", 1, {DICTIONARY_STREET_TYPE}, 2338},
     {"lico", 1, {DICTIONARY_PERSONAL_TITLE}, 1873},
     {"inga", 1, {DICTIONARY_PERSONAL_TITLE}, 2038},
-    {"compañía", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"zona comercial", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"s p a", 1, {DICTIONARY_COMPANY_TYPE}, 1931},
     {"loc", 1, {DICTIONARY_BUILDING_TYPE}, 1883},
     {"brigadier general", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
@@ -72366,6 +72379,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"políg ind", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 2256},
     {"instituto", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"pque", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2197},
+    {"b°", 1, {DICTIONARY_LEVEL_STANDALONE}, 1962},
     {"min", 1, {DICTIONARY_PERSONAL_TITLE}, 2053},
     {"s c e l", 1, {DICTIONARY_COMPANY_TYPE}, 1918},
     {"s.ra", 1, {DICTIONARY_PERSONAL_TITLE}, 2085},
@@ -72467,7 +72481,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"la", 1, {DICTIONARY_STOPWORD}, -1},
     {"entrada", 1, {DICTIONARY_ENTRANCE}, -1},
     {"s.v.", 1, {DICTIONARY_PERSONAL_TITLE}, 2080},
-    {"sociedad anónima inscrita de capital abierto", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"pdte", 1, {DICTIONARY_PERSONAL_TITLE}, 2062},
     {"s.a.s.", 1, {DICTIONARY_COMPANY_TYPE}, 1912},
     {"esquina de", 1, {DICTIONARY_CROSS_STREET}, -1},
     {"x bre", 1, {DICTIONARY_SYNONYM}, 2374},
@@ -72504,6 +72518,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"autop", 1, {DICTIONARY_STREET_TYPE}, 2273},
     {"cine", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"ja", 1, {DICTIONARY_TOPONYM}, 2431},
+    {"b.°", 1, {DICTIONARY_QUALIFIER}, 2236},
     {"mr", 1, {DICTIONARY_TOPONYM}, 2434},
     {"capilla", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"repuestos automotrices", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -72602,6 +72617,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"i", 1, {DICTIONARY_UNIT_DIRECTION}, 2451},
     {"ote", 1, {DICTIONARY_DIRECTIONAL}, 1945},
     {"rcda", 1, {DICTIONARY_STREET_TYPE}, 2341},
+    {"p.°", 1, {DICTIONARY_STREET_TYPE}, 2328},
     {"s c a", 1, {DICTIONARY_COMPANY_TYPE}, 1923},
     {"doctora", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"retorno", 1, {DICTIONARY_STREET_TYPE}, -1},
@@ -72676,6 +72692,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"extension", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2159},
     {"méxico", 1, {DICTIONARY_TOPONYM}, -1},
     {"e", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"nmr°", 1, {DICTIONARY_NUMBER}, 1976},
     {"obispo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"s.w.", 1, {DICTIONARY_DIRECTIONAL}, 1949},
     {"sociedad anónima promotora de inversión", 1, {DICTIONARY_COMPANY_TYPE}, -1},
@@ -73021,6 +73038,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"pequeno supermercado", 1, {DICTIONARY_PLACE_NAME}, 2203},
     {"asociacion civil", 1, {DICTIONARY_COMPANY_TYPE}, 1888},
     {"cantera", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},
+    {"franc", 1, {DICTIONARY_GIVEN_NAME}, 1954},
     {"mtrio", 1, {DICTIONARY_PLACE_NAME}, 2189},
     {"centro com", 1, {DICTIONARY_PLACE_NAME}, 2125},
     {"plzta", 1, {DICTIONARY_STREET_TYPE}, 2334},
@@ -73117,6 +73135,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"núm.ro", 1, {DICTIONARY_NUMBER}, 1976},
     {"área recreativa", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"w", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
+    {"s.r.l", 1, {DICTIONARY_COMPANY_TYPE}, 1920},
     {"seccion", 1, {DICTIONARY_QUALIFIER}, 2259},
     {"cint", 1, {DICTIONARY_STREET_TYPE}, 2305},
     {"maestro", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
@@ -73136,7 +73155,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"malecón", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"apartamento", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"estcn de tren", 1, {DICTIONARY_PLACE_NAME}, 2156},
-    {"franc", 1, {DICTIONARY_GIVEN_NAME}, 1954},
+    {"fc°", 1, {DICTIONARY_GIVEN_NAME}, 1953},
     {"lado", 1, {DICTIONARY_STOPWORD}, -1},
     {"pbla", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2206},
     {"esc", 1, {DICTIONARY_STAIRCASE}, 2264},
@@ -73207,8 +73226,10 @@ address_expansion_rule_t expansion_rules[] = {
     {"merc público", 1, {DICTIONARY_PLACE_NAME}, 2187},
     {"sendero", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"kra", 1, {DICTIONARY_STREET_TYPE}, 2299},
+    {"nr°", 1, {DICTIONARY_NUMBER}, 1976},
     {"rch", 1, {DICTIONARY_PLACE_NAME}, 2212},
     {"u.d", 1, {DICTIONARY_COMPANY_TYPE}, 1932},
+    {"n.° int", 1, {DICTIONARY_UNIT_NUMBERED}, 2457},
     {"pantano", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"c h", 1, {DICTIONARY_STREET_TYPE}, 2293},
     {"escalera", 1, {DICTIONARY_STAIRCASE}, -1},
@@ -73435,6 +73456,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"malecon", 1, {DICTIONARY_STREET_TYPE}, 2322},
     {"union", 1, {DICTIONARY_COMPANY_TYPE}, 1933},
     {"№ in", 1, {DICTIONARY_UNIT_NUMBERED}, 2457},
+    {"fc°", 1, {DICTIONARY_GIVEN_NAME}, 1954},
     {"vcto", 1, {DICTIONARY_STREET_TYPE}, 2353},
     {"d.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 2018},
     {"is", 1, {DICTIONARY_QUALIFIER}, 2247},
@@ -73445,6 +73467,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"jardin de infancia", 1, {DICTIONARY_PLACE_NAME}, 2177},
     {"sarg my", 1, {DICTIONARY_PERSONAL_TITLE}, 2077},
     {"jdins", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 2178},
+    {"mar", 1, {DICTIONARY_SYNONYM}, 2387},
     {"vist", 1, {DICTIONARY_STREET_TYPE}, 2355},
     {"proximo", 1, {DICTIONARY_NEAR}, 1974},
     {"p k", 1, {DICTIONARY_QUALIFIER}, 2258},
@@ -73457,6 +73480,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"f.c.", 1, {DICTIONARY_COMPANY_TYPE}, 1899},
     {"e u", 1, {DICTIONARY_COMPANY_TYPE}, 1898},
     {"fdez", 1, {DICTIONARY_SURNAME}, 2356},
+    {"n° in", 1, {DICTIONARY_UNIT_NUMBERED}, 2457},
     {"dept", 1, {DICTIONARY_UNIT_NUMBERED}, 2455},
     {"locutor", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"dira", 1, {DICTIONARY_PERSONAL_TITLE}, 2014},
@@ -73482,6 +73506,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"s.a.b.", 1, {DICTIONARY_COMPANY_TYPE}, 1903},
     {"cr", 1, {DICTIONARY_STREET_TYPE}, 2300},
     {"cte", 1, {DICTIONARY_PERSONAL_TITLE}, 2002},
+    {"n.° ext", 1, {DICTIONARY_HOUSE_NUMBER}, 1957},
     {"ca", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"laguna", 1, {DICTIONARY_SYNONYM}, -1},
     {"tb", 1, {DICTIONARY_TOPONYM}, 2443},
@@ -73572,6 +73597,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"ctro comunitaro", 1, {DICTIONARY_PLACE_NAME}, 2126},
     {"scel", 1, {DICTIONARY_COMPANY_TYPE}, 1918},
     {"parque tematico", 1, {DICTIONARY_PLACE_NAME}, 2199},
+    {"nmr.°", 1, {DICTIONARY_NUMBER}, 1976},
     {"mntes", 1, {DICTIONARY_SYNONYM}, 2391},
     {"dic.e", 1, {DICTIONARY_SYNONYM}, 2374},
     {"tte", 1, {DICTIONARY_PERSONAL_TITLE}, 2092},
@@ -74103,6 +74129,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"c p", 1, {DICTIONARY_POST_OFFICE}, 2797},
     {"brg", 2, {DICTIONARY_QUALIFIER, DICTIONARY_SYNONYM}, 2800},
     {"île", 1, {DICTIONARY_QUALIFIER}, -1},
+    {"n.°", 1, {DICTIONARY_NUMBER}, 2652},
     {"ach", 1, {DICTIONARY_STREET_TYPE}, 2820},
     {"r", 1, {DICTIONARY_STREET_TYPE}, 2941},
     {"pour", 1, {DICTIONARY_STREET_TYPE}, 2924},
@@ -75353,6 +75380,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"association", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"au", 1, {DICTIONARY_STREET_TYPE}, 2928},
     {"cel", 1, {DICTIONARY_PERSONAL_TITLE}, 2658},
+    {"n°", 1, {DICTIONARY_NUMBER}, 2652},
     {"s.a", 1, {DICTIONARY_PERSONAL_TITLE}, 2701},
     {"nr", 1, {DICTIONARY_NUMBER}, 2652},
     {"barriêre", 1, {DICTIONARY_STREET_TYPE}, -1},
@@ -76626,7 +76654,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"bet.a", 1, {DICTIONARY_PLACE_NAME}, 3321},
     {"g.i.e", 1, {DICTIONARY_COMPANY_TYPE}, 3227},
     {"ang", 1, {DICTIONARY_STREET_TYPE}, 3422},
-    {"bs", 1, {DICTIONARY_TOPONYM}, 3689},
+    {"terminal traghetto", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"convto", 1, {DICTIONARY_PLACE_NAME}, 3355},
     {"pcolo", 1, {DICTIONARY_SYNONYM}, 3671},
     {"sp", 1, {DICTIONARY_TOPONYM}, 3761},
@@ -76904,6 +76932,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"fro", 1, {DICTIONARY_PLACE_NAME}, 3361},
     {"societa in accomandita per azioni", 1, {DICTIONARY_COMPANY_TYPE}, 3235},
     {"cosenza", 1, {DICTIONARY_TOPONYM}, -1},
+    {"n°", 1, {DICTIONARY_NUMBER}, 3254},
     {"z.i.", 1, {DICTIONARY_STREET_TYPE}, 3560},
     {"snu", 1, {DICTIONARY_STREET_TYPE}, 3516},
     {"gr.po", 1, {DICTIONARY_SYNONYM}, 3622},
@@ -76911,6 +76940,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"gruppo", 1, {DICTIONARY_SYNONYM}, -1},
     {"carabinieri", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"rovigo", 1, {DICTIONARY_TOPONYM}, -1},
+    {"pn°", 1, {DICTIONARY_LEVEL_NUMBERED}, 3250},
     {"vcv", 1, {DICTIONARY_STREET_TYPE}, 3553},
     {"porto", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"cola", 1, {DICTIONARY_QUALIFIER}, 3411},
@@ -77101,6 +77131,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"calzolaio", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"industriali", 1, {DICTIONARY_SYNONYM}, -1},
     {"borg.e", 1, {DICTIONARY_QUALIFIER}, 3406},
+    {"sui", 1, {DICTIONARY_STOPWORD}, -1},
     {"s.n.c.", 1, {DICTIONARY_COMPANY_TYPE}, 3233},
     {"int.no", 1, {DICTIONARY_SYNONYM}, 3633},
     {"nord ovest", 1, {DICTIONARY_DIRECTIONAL}, -1},
@@ -77182,7 +77213,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"strada privata", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"c p", 1, {DICTIONARY_POST_OFFICE}, 3403},
     {"ferr.a", 1, {DICTIONARY_PLACE_NAME}, 3364},
-    {"sui", 1, {DICTIONARY_STOPWORD}, -1},
+    {"p°", 1, {DICTIONARY_LEVEL_NUMBERED}, 3250},
     {"sca", 1, {DICTIONARY_STREET_TYPE}, 3507},
     {"chieti", 1, {DICTIONARY_TOPONYM}, -1},
     {"associazione calcio", 1, {DICTIONARY_COMPANY_TYPE}, -1},
@@ -77338,6 +77369,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"società in accomandità per azioni", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"s.s.", 1, {DICTIONARY_COMPANY_TYPE}, 3231},
     {"società semplice", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"bs", 1, {DICTIONARY_TOPONYM}, 3689},
     {"albo", 1, {DICTIONARY_PLACE_NAME}, 3311},
     {"fossa", 1, {DICTIONARY_SYNONYM}, -1},
     {"magazi", 1, {DICTIONARY_PLACE_NAME}, 3385},
@@ -77406,7 +77438,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"clare", 1, {DICTIONARY_PLACE_NAME}, 3340},
     {"s", 1, {DICTIONARY_PERSONAL_TITLE}, 3288},
     {"pub", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"terminal traghetto", 1, {DICTIONARY_PLACE_NAME}, -1},
+    {"fondo", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"p t", 1, {DICTIONARY_LEVEL_STANDALONE}, 3251},
     {"pres emerito", 1, {DICTIONARY_PERSONAL_TITLE}, 3281},
     {"cas.ma", 1, {DICTIONARY_PLACE_NAME}, 3336},
@@ -77465,6 +77497,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"societa a garanzia limitata", 1, {DICTIONARY_COMPANY_TYPE}, 3236},
     {"gge", 1, {DICTIONARY_UNIT_NUMBERED}, 3784},
     {"l.ghi", 1, {DICTIONARY_SYNONYM}, 3637},
+    {"p.°", 1, {DICTIONARY_LEVEL_NUMBERED}, 3250},
     {"madla", 1, {DICTIONARY_PLACE_NAME}, 3383},
     {"in", 2, {DICTIONARY_NEAR, DICTIONARY_STOPWORD}, -1},
     {"blocchi", 1, {DICTIONARY_QUALIFIER}, -1},
@@ -77578,7 +77611,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"maggiori", 1, {DICTIONARY_SYNONYM}, -1},
     {"pre", 1, {DICTIONARY_STREET_TYPE}, 3404},
     {"vigili del fuoco", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"strette", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"p.n°", 1, {DICTIONARY_LEVEL_NUMBERED}, 3250},
     {"vi", 1, {DICTIONARY_TOPONYM}, 3778},
     {"gend.ria", 1, {DICTIONARY_PLACE_NAME}, 3375},
     {"fca", 1, {DICTIONARY_STREET_TYPE}, 3456},
@@ -77687,6 +77720,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"s.p", 1, {DICTIONARY_STREET_TYPE}, 3517},
     {"reverendo", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"mlo", 1, {DICTIONARY_STREET_TYPE}, 3477},
+    {"strette", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"s", 1, {DICTIONARY_PERSONAL_TITLE}, 3287},
     {"dpmto", 1, {DICTIONARY_PLACE_NAME}, 3356},
     {"univ", 1, {DICTIONARY_PLACE_NAME}, 3402},
@@ -77839,7 +77873,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"scala", 2, {DICTIONARY_STAIRCASE, DICTIONARY_STREET_TYPE}, -1},
     {"levante", 1, {DICTIONARY_DIRECTIONAL}, -1},
     {"diversivo", 1, {DICTIONARY_SYNONYM}, -1},
-    {"fondo", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"n.°", 1, {DICTIONARY_NUMBER}, 3254},
     {"gr", 1, {DICTIONARY_TOPONYM}, 3713},
     {"go", 1, {DICTIONARY_TOPONYM}, 3712},
     {"vr", 1, {DICTIONARY_TOPONYM}, 3779},
@@ -79955,7 +79989,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"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},
+    {"av", 1, {DICTIONARY_STREET_TYPE}, 4432},
     {"excelentissima", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"s / n", 1, {DICTIONARY_NO_NUMBER}, 4261},
     {"futebol clube", 1, {DICTIONARY_COMPANY_TYPE}, -1},
@@ -80028,7 +80062,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"sociedade em nome coletivo", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"capitão de corveta", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"g.n.r.", 1, {DICTIONARY_PLACE_NAME}, 4393},
-    {"uma", 1, {DICTIONARY_STOPWORD}, -1},
+    {"enf°", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
     {"mnte", 1, {DICTIONARY_SYNONYM}, 4485},
     {"empresa pública", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"cap corv", 1, {DICTIONARY_PERSONAL_TITLE}, 4274},
@@ -80038,10 +80072,13 @@ address_expansion_rule_t expansion_rules[] = {
     {"prolng", 1, {DICTIONARY_STREET_TYPE}, 4457},
     {"á", 1, {DICTIONARY_STOPWORD}, -1},
     {"n o", 1, {DICTIONARY_DIRECTIONAL}, 4245},
+    {"8br.o", 1, {DICTIONARY_SYNONYM}, 4488},
     {"associação desportiva", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"transversal", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"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},
+    {"st°", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
     {"n srª", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
     {"vigario", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"c.d.", 1, {DICTIONARY_COMPANY_TYPE}, 4211},
@@ -80097,6 +80134,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"instituto", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"s.c.s.", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
     {"estacao de camionagem", 1, {DICTIONARY_PLACE_NAME}, 4385},
+    {"pi", 1, {DICTIONARY_TOPONYM}, 4511},
     {"itinerario principal", 1, {DICTIONARY_STREET_TYPE}, 4448},
     {"estação de camionagem", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"e.p", 1, {DICTIONARY_COMPANY_TYPE}, 4217},
@@ -80148,6 +80186,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"s.e", 1, {DICTIONARY_DIRECTIONAL}, 4247},
     {"bv", 1, {DICTIONARY_PLACE_NAME}, 4370},
     {"alf", 1, {DICTIONARY_PERSONAL_TITLE}, 4266},
+    {"eng°", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
     {"companhia anonima", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"urb", 1, {DICTIONARY_QUALIFIER}, 4419},
     {"o.s.c.i.p.", 1, {DICTIONARY_COMPANY_TYPE}, 4223},
@@ -80203,8 +80242,9 @@ address_expansion_rule_t expansion_rules[] = {
     {"9bro", 1, {DICTIONARY_SYNONYM}, 4487},
     {"c.a", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
     {"ave marg", 1, {DICTIONARY_STREET_TYPE}, 4433},
+    {"brº", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4369},
     {"presidente", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
-    {"e n", 1, {DICTIONARY_STREET_TYPE}, 4444},
+    {"br°", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4369},
     {"ribr.a", 1, {DICTIONARY_SYNONYM}, 4490},
     {"ex.mº", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
     {"sp", 1, {DICTIONARY_TOPONYM}, 4518},
@@ -80215,7 +80255,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"estação ferroviária", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"s", 1, {DICTIONARY_DIRECTIONAL}, 4249},
     {"out", 1, {DICTIONARY_SYNONYM}, 4488},
-    {"abr", 1, {DICTIONARY_SYNONYM}, 4472},
+    {"n°", 1, {DICTIONARY_NUMBER}, 4262},
     {"sr.ª", 1, {DICTIONARY_PERSONAL_TITLE}, 4353},
     {"mq", 1, {DICTIONARY_PERSONAL_TITLE}, 4321},
     {"sociedade por acoes", 1, {DICTIONARY_COMPANY_TYPE}, -1},
@@ -80238,7 +80278,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"cac", 1, {DICTIONARY_PERSONAL_TITLE}, 4272},
     {"escola", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"hab", 1, {DICTIONARY_BUILDING_TYPE}, 4204},
-    {"mal", 1, {DICTIONARY_PERSONAL_TITLE}, 4320},
+    {"nr°", 1, {DICTIONARY_NUMBER}, 4262},
     {"astrada marginal", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"itinerario complementar", 1, {DICTIONARY_STREET_TYPE}, 4447},
     {"inf", 1, {DICTIONARY_SYNONYM}, 4478},
@@ -80358,6 +80398,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"bar", 1, {DICTIONARY_PERSONAL_TITLE}, 4269},
     {"empresa publica", 1, {DICTIONARY_COMPANY_TYPE}, 4217},
     {"s.g.p.s", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
+    {"abr", 1, {DICTIONARY_SYNONYM}, 4472},
     {"rua particular", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"s / nº", 1, {DICTIONARY_NO_NUMBER}, 4261},
     {"comend", 1, {DICTIONARY_PERSONAL_TITLE}, 4280},
@@ -80411,7 +80452,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"etar", 1, {DICTIONARY_PLACE_NAME}, 4383},
     {"marques", 1, {DICTIONARY_PERSONAL_TITLE}, 4321},
     {"mnt", 1, {DICTIONARY_SYNONYM}, 4485},
-    {"rot", 1, {DICTIONARY_STREET_TYPE}, 4461},
+    {"prof°", 1, {DICTIONARY_PERSONAL_TITLE}, 4335},
     {"c.r.l.", 1, {DICTIONARY_COMPANY_TYPE}, 4214},
     {"liberde", 1, {DICTIONARY_SYNONYM}, 4486},
     {"volta", 1, {DICTIONARY_STREET_TYPE}, -1},
@@ -80434,6 +80475,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"cam", 1, {DICTIONARY_STREET_TYPE}, 4438},
     {"nr.º", 1, {DICTIONARY_NUMBER}, 4262},
     {"s.g.p.s.", 1, {DICTIONARY_COMPANY_TYPE}, 4232},
+    {"e n", 1, {DICTIONARY_STREET_TYPE}, 4444},
     {"tunel", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"prof", 1, {DICTIONARY_PERSONAL_TITLE}, 4335},
     {"senhoritas", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
@@ -80476,12 +80518,13 @@ address_expansion_rule_t expansion_rules[] = {
     {"professores", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"ago", 1, {DICTIONARY_SYNONYM}, 4474},
     {"ic", 1, {DICTIONARY_STREET_TYPE}, 4447},
-    {"8br.o", 1, {DICTIONARY_SYNONYM}, 4488},
+    {"il.m°", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
     {"sec.a", 1, {DICTIONARY_PERSONAL_TITLE}, 4348},
     {"excelencia", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"sociedade anónima de responsabilidade limitada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"cambio", 1, {DICTIONARY_PLACE_NAME}, 4372},
     {"largo", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"mal", 1, {DICTIONARY_PERSONAL_TITLE}, 4320},
     {"vila", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"comendador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"pont", 1, {DICTIONARY_PLACE_NAME}, 4403},
@@ -80502,11 +80545,12 @@ address_expansion_rule_t expansion_rules[] = {
     {"g.n.r", 1, {DICTIONARY_PLACE_NAME}, 4393},
     {"aqui", 1, {DICTIONARY_NEAR}, -1},
     {"governador", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"ex.m°", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
     {"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},
+    {"nr.°", 1, {DICTIONARY_NUMBER}, 4262},
     {"profa", 1, {DICTIONARY_PERSONAL_TITLE}, 4336},
     {"8bro", 1, {DICTIONARY_SYNONYM}, 4488},
     {"ex.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
@@ -80515,6 +80559,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"ong", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
     {"nª sª", 1, {DICTIONARY_PERSONAL_TITLE}, 4329},
     {"maio", 1, {DICTIONARY_SYNONYM}, -1},
+    {"nmr°", 1, {DICTIONARY_NUMBER}, 4262},
     {"enf", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
     {"apartamento", 1, {DICTIONARY_UNIT_NUMBERED}, -1},
     {"pc", 1, {DICTIONARY_STREET_TYPE}, 4454},
@@ -80620,6 +80665,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"departamentos", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"auto estr", 1, {DICTIONARY_STREET_TYPE}, 4431},
     {"policia de seguranca publica", 1, {DICTIONARY_PLACE_NAME}, 4401},
+    {"nmr.°", 1, {DICTIONARY_NUMBER}, 4262},
     {"p.l.l.c.", 1, {DICTIONARY_COMPANY_TYPE}, 4235},
     {"ba", 1, {DICTIONARY_TOPONYM}, 4498},
     {"sec", 1, {DICTIONARY_QUALIFIER}, 4417},
@@ -80637,6 +80683,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"arquitecto", 1, {DICTIONARY_PLACE_NAME}, -1},
     {"med", 1, {DICTIONARY_PERSONAL_TITLE}, 4324},
     {"ilma", 1, {DICTIONARY_PERSONAL_TITLE}, 4310},
+    {"fren", 1, {DICTIONARY_UNIT_DIRECTION}, 4446},
     {"sarl", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
     {"slj", 1, {DICTIONARY_UNIT_STANDALONE}, 4527},
     {"s.a", 1, {DICTIONARY_COMPANY_TYPE}, 4234},
@@ -80679,9 +80726,11 @@ address_expansion_rule_t expansion_rules[] = {
     {"neto", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},
     {"g n r", 1, {DICTIONARY_PLACE_NAME}, 4393},
     {"santa catarina", 1, {DICTIONARY_TOPONYM}, -1},
+    {"s / n°", 1, {DICTIONARY_NO_NUMBER}, 4261},
     {"az", 1, {DICTIONARY_STREET_TYPE}, 4434},
     {"travessa", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"sociedade por quotas limitada", 1, {DICTIONARY_COMPANY_TYPE}, 4233},
+    {"nrº", 1, {DICTIONARY_NUMBER}, 4262},
     {"ribro", 1, {DICTIONARY_SYNONYM}, 4491},
     {"p t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4257},
     {"númro", 1, {DICTIONARY_NUMBER}, 4262},
@@ -80708,11 +80757,12 @@ address_expansion_rule_t expansion_rules[] = {
     {"arq", 1, {DICTIONARY_PLACE_NAME}, 4368},
     {"inform", 1, {DICTIONARY_SYNONYM}, 4478},
     {"estr r", 1, {DICTIONARY_STREET_TYPE}, 4445},
+    {"enf.°", 1, {DICTIONARY_PERSONAL_TITLE}, 4301},
     {"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},
+    {"rot", 1, {DICTIONARY_STREET_TYPE}, 4461},
     {"organização da sociedade civil de interesse público", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"praceta", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"rj", 1, {DICTIONARY_TOPONYM}, 4512},
@@ -80805,6 +80855,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"o.n.g", 1, {DICTIONARY_COMPANY_TYPE}, 4222},
     {"mus", 1, {DICTIONARY_PLACE_NAME}, 4398},
     {"senhores", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
+    {"n.°", 1, {DICTIONARY_NUMBER}, 4262},
     {"st.o", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
     {"na esq de", 1, {DICTIONARY_CROSS_STREET}, 4239},
     {"com", 2, {DICTIONARY_CROSS_STREET, DICTIONARY_STOPWORD}, -1},
@@ -80834,6 +80885,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"u l d a", 1, {DICTIONARY_COMPANY_TYPE}, 4237},
     {"c / v", 1, {DICTIONARY_LEVEL_BASEMENT}, 4251},
     {"f.te", 1, {DICTIONARY_PLACE_NAME}, 4391},
+    {"sn°", 1, {DICTIONARY_NO_NUMBER}, 4261},
     {"capitão", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"capitao de corveta", 1, {DICTIONARY_PERSONAL_TITLE}, 4274},
     {"loteam", 1, {DICTIONARY_PLACE_NAME}, 4397},
@@ -80841,6 +80893,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"s.a.d.", 1, {DICTIONARY_COMPANY_TYPE}, 4227},
     {"c a", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
     {"pavimento terréo", 1, {DICTIONARY_LEVEL_STANDALONE}, -1},
+    {"b°", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 4369},
     {"barao", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"lg", 1, {DICTIONARY_STREET_TYPE}, 4450},
     {"câmbio", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -80853,11 +80906,12 @@ address_expansion_rule_t expansion_rules[] = {
     {"s o", 1, {DICTIONARY_DIRECTIONAL}, 4248},
     {"sport clube", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"mons", 1, {DICTIONARY_PERSONAL_TITLE}, 4328},
-    {"transversal", 1, {DICTIONARY_STREET_TYPE}, -1},
+    {"eng.°", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
     {"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},
+    {"ilm°", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
     {"stª", 1, {DICTIONARY_PERSONAL_TITLE}, 4343},
     {"ljs", 1, {DICTIONARY_PLACE_NAME}, 4396},
     {"c.a.", 1, {DICTIONARY_COMPANY_TYPE}, 4213},
@@ -80901,7 +80955,8 @@ address_expansion_rule_t expansion_rules[] = {
     {"p.t", 1, {DICTIONARY_LEVEL_STANDALONE}, 4257},
     {"código postal", 1, {DICTIONARY_POSTAL_CODE}, -1},
     {"exmº", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
-    {"av", 1, {DICTIONARY_STREET_TYPE}, 4432},
+    {"st.°", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
+    {"10b.ro", 1, {DICTIONARY_SYNONYM}, 4475},
     {"p.e", 1, {DICTIONARY_PERSONAL_TITLE}, 4331},
     {"pq", 1, {DICTIONARY_PLACE_NAME}, 4399},
     {"q", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
@@ -80911,18 +80966,20 @@ address_expansion_rule_t expansion_rules[] = {
     {"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},
+    {"s.n°", 1, {DICTIONARY_NO_NUMBER}, 4261},
     {"monte", 1, {DICTIONARY_SYNONYM}, -1},
-    {"sto", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
+    {"im°", 1, {DICTIONARY_PERSONAL_TITLE}, 4314},
     {"go", 1, {DICTIONARY_TOPONYM}, 4502},
     {"df", 1, {DICTIONARY_TOPONYM}, 4500},
     {"capitao", 1, {DICTIONARY_PERSONAL_TITLE}, 4273},
     {"fundação privada", 1, {DICTIONARY_COMPANY_TYPE}, -1},
+    {"uma", 1, {DICTIONARY_STOPWORD}, -1},
     {"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},
+    {"s.a", 1, {DICTIONARY_COMPANY_TYPE}, 4225},
     {"vv", 1, {DICTIONARY_BUILDING_TYPE}, 4207},
     {"numro", 1, {DICTIONARY_NUMBER}, 4262},
     {"brg", 1, {DICTIONARY_PERSONAL_TITLE}, 4271},
@@ -80988,7 +81045,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"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},
+    {"exm°", 1, {DICTIONARY_PERSONAL_TITLE}, 4306},
     {"na", 1, {DICTIONARY_STOPWORD}, 4427},
     {"s.a.r.l", 1, {DICTIONARY_COMPANY_TYPE}, 4226},
     {"vd", 1, {DICTIONARY_STREET_TYPE}, 4469},
@@ -81056,7 +81113,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"ilmº", 1, {DICTIONARY_PERSONAL_TITLE}, 4311},
     {"sobre", 1, {DICTIONARY_STOPWORD}, -1},
     {"loja", 1, {DICTIONARY_PLACE_NAME}, -1},
-    {"pi", 1, {DICTIONARY_TOPONYM}, 4511},
+    {"capitão de mar e guerra", 1, {DICTIONARY_PERSONAL_TITLE}, -1},
     {"s.c.s", 1, {DICTIONARY_COMPANY_TYPE}, 4230},
     {"eng", 1, {DICTIONARY_PERSONAL_TITLE}, 4303},
     {"cc", 1, {DICTIONARY_PLACE_NAME}, 4375},
@@ -81066,6 +81123,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"em.mo", 1, {DICTIONARY_PERSONAL_TITLE}, 4299},
     {"unipessoal lda", 1, {DICTIONARY_COMPANY_TYPE}, -1},
     {"ceb", 1, {DICTIONARY_PLACE_NAME}, 4376},
+    {"sto", 1, {DICTIONARY_PERSONAL_TITLE}, 4344},
     {"rotunda", 1, {DICTIONARY_STREET_TYPE}, -1},
     {"as", 1, {DICTIONARY_STOPWORD}, 4422},
     {"casal", 1, {DICTIONARY_PLACE_NAME}, -1},
@@ -81202,7 +81260,8 @@ address_expansion_rule_t expansion_rules[] = {
     {"bulevardu", 1, {DICTIONARY_STREET_TYPE}, 4552},
     {"fnd", 1, {DICTIONARY_STREET_TYPE}, 4554},
     {"lângă mine", 1, {DICTIONARY_NEAR}, -1},
-    {"bdul", 1, {DICTIONARY_STREET_TYPE}, 4552},
+    {"nord", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"n°", 1, {DICTIONARY_NUMBER}, 4541},
     {"sc", 1, {DICTIONARY_STAIRCASE}, 4550},
     {"n", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},
     {"№", 1, {DICTIONARY_NUMBER}, 4541},
@@ -81231,7 +81290,7 @@ address_expansion_rule_t expansion_rules[] = {
     {"fără număr", 1, {DICTIONARY_NO_NUMBER}, -1},
     {"intre", 1, {DICTIONARY_CROSS_STREET}, 4529},
     {"șos", 1, {DICTIONARY_STREET_TYPE}, 4560},
-    {"nord", 1, {DICTIONARY_DIRECTIONAL}, -1},
+    {"bdul", 1, {DICTIONARY_STREET_TYPE}, 4552},
     {"str", 1, {DICTIONARY_STREET_TYPE}, 4558},
     {"soseaua", 1, {DICTIONARY_STREET_TYPE}, 4560},
     {"etj", 1, {DICTIONARY_LEVEL_NUMBERED}, 4536},
@@ -83493,49 +83552,49 @@ address_language_index_t expansion_languages[] = {
     {"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}
+    {"es", 66224, 2221},
+    {"et", 68445, 202},
+    {"eu", 68647, 149},
+    {"fa", 68796, 16},
+    {"fi", 68812, 108},
+    {"fil", 68920, 3},
+    {"fr", 68923, 1577},
+    {"ga", 70500, 180},
+    {"gd", 70680, 104},
+    {"gl", 70784, 118},
+    {"gsw", 70902, 19},
+    {"he", 70921, 26},
+    {"hi", 70947, 4},
+    {"hr", 70951, 102},
+    {"hu", 71053, 108},
+    {"id", 71161, 92},
+    {"is", 71253, 95},
+    {"it", 71348, 1826},
+    {"ja", 73174, 276},
+    {"ka", 73450, 27},
+    {"ko", 73477, 52},
+    {"lb", 73529, 3},
+    {"lt", 73532, 77},
+    {"lv", 73609, 54},
+    {"ms", 73663, 123},
+    {"mt", 73786, 20},
+    {"nb", 73806, 167},
+    {"nl", 73973, 399},
+    {"oc", 74372, 27},
+    {"pap", 74399, 5},
+    {"pl", 74404, 397},
+    {"pt", 74801, 1231},
+    {"ro", 76032, 138},
+    {"ru", 76170, 572},
+    {"si", 76742, 15},
+    {"sk", 76757, 275},
+    {"sl", 77032, 95},
+    {"sr", 77127, 145},
+    {"sv", 77272, 239},
+    {"th", 77511, 23},
+    {"tr", 77534, 96},
+    {"uk", 77630, 416},
+    {"ur", 78046, 7},
+    {"vi", 78053, 170},
+    {"zh", 78223, 141}
 };