diff --git a/resources/dictionaries/ca/postal_code.txt b/resources/dictionaries/ca/postcodes.txt
similarity index 100%
rename from resources/dictionaries/ca/postal_code.txt
rename to resources/dictionaries/ca/postcodes.txt
diff --git a/resources/dictionaries/cs/unit_types.txt b/resources/dictionaries/cs/unit_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/cs/unit_types.txt
rename to resources/dictionaries/cs/unit_types_numbered.txt
diff --git a/resources/dictionaries/es/ambiguous_expansions.txt b/resources/dictionaries/es/ambiguous_expansions.txt
index b8d29c19..2069e0f8 100644
--- a/resources/dictionaries/es/ambiguous_expansions.txt
+++ b/resources/dictionaries/es/ambiguous_expansions.txt
@@ -9,4 +9,35 @@ p
 s
 v
 un
-w
\ No newline at end of file
+w
+ag
+bn
+bs
+cm
+cp
+ch
+ca
+cl
+du
+gt
+gr
+hi
+ja
+mx
+mc
+mr
+na
+nl
+oa
+pu
+qe
+qr
+sl
+si
+so
+tb
+tm
+tl
+ve
+yu
+za
\ No newline at end of file
diff --git a/resources/dictionaries/es/building_types.txt b/resources/dictionaries/es/building_types.txt
index 7142a690..6328a130 100644
--- a/resources/dictionaries/es/building_types.txt
+++ b/resources/dictionaries/es/building_types.txt
@@ -11,4 +11,5 @@ edificio|edifc|edfc|edif
 estancia|estanc|est
 local|loc|lc
 residencial|resid|res
-torre|to
\ No newline at end of file
+torre|to
+vivienda|vvda
\ No newline at end of file
diff --git a/resources/dictionaries/es/number.txt b/resources/dictionaries/es/number.txt
index 5ab463fc..07202f94 100644
--- a/resources/dictionaries/es/number.txt
+++ b/resources/dictionaries/es/number.txt
@@ -1 +1 @@
-número|#|num|núm|no|numero|№|nº|n.º|númr|numr|númro|numro|núm.ro|nr|num.ro|nro|n.ro
\ No newline at end of file
+número|#|num|núm|no|numero|№|nº|n.º|númr|numr|númro|numro|núm.ro|nr|num.ro|nro|n.ro|nr.º|nmro|nmr.o|nmrº|nmr.º
\ No newline at end of file
diff --git a/resources/dictionaries/es/toponyms.txt b/resources/dictionaries/es/toponyms.txt
index bf2d91d3..df1a6f56 100644
--- a/resources/dictionaries/es/toponyms.txt
+++ b/resources/dictionaries/es/toponyms.txt
@@ -4,4 +4,35 @@ capital federal|cap fed
 ciudad de méxico|c méx|c mex|c de méx|c de mex|ciudad de mexico
 distrito federal|df|d.f|d f
 distrito capital|dc|d.c|d c
-madrid|madd
\ No newline at end of file
+madrid|madd
+aguascalientes|ag
+baja california|bn
+baja california sur|bs
+campeche|cm
+chiapas|cp
+chihuahua|ch
+coahuila|ca
+colima|cl
+durango|du
+guanajuato|gt
+guerrero|gr
+hidalgo|hi
+jalisco|ja
+méxico|mexico|mx
+michoacán|michoacan|mc
+morelos|mr
+nayarit|na
+nuevo león|nuevo leon|nl
+oaxaca|oa
+puebla|pu
+querétaro|queretaro|qe
+quintana roo|qr
+san luis potosí|san luis potosi|sl
+sinaloa|si
+sonora|so
+tabasco|tb
+tamaulipas|tm
+tlaxcala|tl
+veracruz|ve
+yucatán|yucatan|yu
+zacatecas|za
\ No newline at end of file
diff --git a/resources/dictionaries/ga/level_types.txt b/resources/dictionaries/ga/level_types_standalone.txt
similarity index 100%
rename from resources/dictionaries/ga/level_types.txt
rename to resources/dictionaries/ga/level_types_standalone.txt
diff --git a/resources/dictionaries/ga/unit_types.txt b/resources/dictionaries/ga/unit_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/ga/unit_types.txt
rename to resources/dictionaries/ga/unit_types_numbered.txt
diff --git a/resources/dictionaries/it/building_types.txt b/resources/dictionaries/it/building_types.txt
new file mode 100644
index 00000000..e7afc05b
--- /dev/null
+++ b/resources/dictionaries/it/building_types.txt
@@ -0,0 +1,5 @@
+casa|c|ca|ca'
+casetto|c.etto
+edificio|edif.o|edifo
+palazzina
+palazzo|pal.zo|palzo
\ No newline at end of file
diff --git a/resources/dictionaries/it/level_types_basement.txt b/resources/dictionaries/it/level_types_basement.txt
new file mode 100644
index 00000000..d8748608
--- /dev/null
+++ b/resources/dictionaries/it/level_types_basement.txt
@@ -0,0 +1,2 @@
+cantina|c.tina|ctina
+seminterrato
\ No newline at end of file
diff --git a/resources/dictionaries/it/level_types_numbered.txt b/resources/dictionaries/it/level_types_numbered.txt
new file mode 100644
index 00000000..1b3b117c
--- /dev/null
+++ b/resources/dictionaries/it/level_types_numbered.txt
@@ -0,0 +1 @@
+piano|pº|p.º|p.o|p.nº|p.no|pnº|pno
\ No newline at end of file
diff --git a/resources/dictionaries/it/place_names.txt b/resources/dictionaries/it/place_names.txt
index 288aa04a..17ef8bb5 100644
--- a/resources/dictionaries/it/place_names.txt
+++ b/resources/dictionaries/it/place_names.txt
@@ -88,6 +88,7 @@ convento|conv.to|convto
 crematorio
 dentista
 diga
+dipartimento|dipart.o|dpmto
 dissalazione|dissal.ne|dissalne
 distilleria|distill.a|distilla
 dormitorio
diff --git a/resources/dictionaries/it/post_office.txt b/resources/dictionaries/it/post_office.txt
index c6a573c9..fd357290 100644
--- a/resources/dictionaries/it/post_office.txt
+++ b/resources/dictionaries/it/post_office.txt
@@ -1,2 +1,2 @@
-casella postale|cp|c.p.|c.p|c p|cpt
+casella postale|cp|c.p.|c.p|c p|cpt|cas pos
 presso|co|c \ o|c / o
diff --git a/resources/dictionaries/it/qualifiers.txt b/resources/dictionaries/it/qualifiers.txt
index a8bc1dc1..b93a4fd9 100644
--- a/resources/dictionaries/it/qualifiers.txt
+++ b/resources/dictionaries/it/qualifiers.txt
@@ -2,8 +2,8 @@ borgata|borg.a|borga
 borgate|borg.e|borge
 borghi|b.ghi|bghi
 borgo|b.go|bgo
-blocchi|bl.i|bli
-blocco|bl.o|blo
+blocco|bl.o|blo|blo
+blocchi|bl.i|bli|bli
 colonia|col.a|cola
 fermata
 fortino|fort.no|fortno
diff --git a/resources/dictionaries/it/staircases.txt b/resources/dictionaries/it/staircases.txt
new file mode 100644
index 00000000..c554e75c
--- /dev/null
+++ b/resources/dictionaries/it/staircases.txt
@@ -0,0 +1 @@
+scala
\ No newline at end of file
diff --git a/resources/dictionaries/it/unit_types.txt b/resources/dictionaries/it/unit_types.txt
deleted file mode 100644
index 3ce19bf3..00000000
--- a/resources/dictionaries/it/unit_types.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-blocco|bl.o|blo|blo
-blocchi|bl.i|bli|bli
-cantina|c.tina|ctina
-casa|c|ca|ca'
-casetto|c.etto
-dipartimento|dipart.o|dpmto
-edificio|edif.o|edifo
-garage|g.ge|gge
-giardino|g.no|gno
-officina|off.a|off
-palazzo|pal.zo|palzo
-piano|pº|p.º|p.o|p.nº|p.no|pnº|pno
\ No newline at end of file
diff --git a/resources/dictionaries/it/unit_types_numbered.txt b/resources/dictionaries/it/unit_types_numbered.txt
new file mode 100644
index 00000000..fb3494e7
--- /dev/null
+++ b/resources/dictionaries/it/unit_types_numbered.txt
@@ -0,0 +1,6 @@
+appartamento|app
+casa|c|ca|ca'
+garage|g.ge|gge
+interno|int
+officina|off.a|off
+sala
\ No newline at end of file
diff --git a/resources/dictionaries/ko/level_types.txt b/resources/dictionaries/ko/level_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/ko/level_types.txt
rename to resources/dictionaries/ko/level_types_numbered.txt
diff --git a/resources/dictionaries/ko/unit_types.txt b/resources/dictionaries/ko/unit_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/ko/unit_types.txt
rename to resources/dictionaries/ko/unit_types_numbered.txt
diff --git a/resources/dictionaries/nb/level_types.txt b/resources/dictionaries/nb/level_types.txt
deleted file mode 100644
index dbe2087b..00000000
--- a/resources/dictionaries/nb/level_types.txt
+++ /dev/null
@@ -1 +0,0 @@
-estasje
\ No newline at end of file
diff --git a/resources/dictionaries/nb/level_types_numbered.txt b/resources/dictionaries/nb/level_types_numbered.txt
new file mode 100644
index 00000000..e4d81980
--- /dev/null
+++ b/resources/dictionaries/nb/level_types_numbered.txt
@@ -0,0 +1 @@
+etasje
\ No newline at end of file
diff --git a/resources/dictionaries/nb/unit_types_numbered.txt b/resources/dictionaries/nb/unit_types_numbered.txt
new file mode 100644
index 00000000..1a8752ab
--- /dev/null
+++ b/resources/dictionaries/nb/unit_types_numbered.txt
@@ -0,0 +1 @@
+leilighet|leil
\ No newline at end of file
diff --git a/resources/dictionaries/pl/level_types.txt b/resources/dictionaries/pl/level_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/pl/level_types.txt
rename to resources/dictionaries/pl/level_types_numbered.txt
diff --git a/resources/dictionaries/pl/place_names.txt b/resources/dictionaries/pl/place_names.txt
index 8ef5956d..f414b3bf 100644
--- a/resources/dictionaries/pl/place_names.txt
+++ b/resources/dictionaries/pl/place_names.txt
@@ -4,6 +4,7 @@ bazylika
 biblioteka|bibl|b-ka|bka
 biblioteka narodowa|bn
 biblioteczka|bczka|b-czka
+departament|dep
 farmacja|farm
 fabryka|f-ka
 gimnazjum|gim
@@ -16,6 +17,7 @@ kościół|kosciol
 liceum|lic
 muzeum
 muzeum narodowe|mn
+oddział|oddz
 opat|op
 organizacja|organ
 ośrodek|ośr
diff --git a/resources/dictionaries/pl/unit_types.txt b/resources/dictionaries/pl/unit_types.txt
deleted file mode 100644
index d3e67abd..00000000
--- a/resources/dictionaries/pl/unit_types.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-departament|dep
-mieszkanie|m
-oddział|oddz
-pokój|pok
\ No newline at end of file
diff --git a/resources/dictionaries/pl/unit_types_numbered.txt b/resources/dictionaries/pl/unit_types_numbered.txt
new file mode 100644
index 00000000..f15f5113
--- /dev/null
+++ b/resources/dictionaries/pl/unit_types_numbered.txt
@@ -0,0 +1,2 @@
+mieszkanie|m
+pokój|pok
\ No newline at end of file
diff --git a/resources/dictionaries/pt/building_types.txt b/resources/dictionaries/pt/building_types.txt
index 7d7c523a..aab15f00 100644
--- a/resources/dictionaries/pt/building_types.txt
+++ b/resources/dictionaries/pt/building_types.txt
@@ -1,4 +1,7 @@
 bloco|bl
+condominio
 edifício|edificio|edf|edif
+habitação|habitacao|hab
+residencia|res
 torre|tr
-vivenda|vv
\ No newline at end of file
+vivenda|vv|vvda
\ No newline at end of file
diff --git a/resources/dictionaries/pt/level_types_basement.txt b/resources/dictionaries/pt/level_types_basement.txt
new file mode 100644
index 00000000..27ea858b
--- /dev/null
+++ b/resources/dictionaries/pt/level_types_basement.txt
@@ -0,0 +1 @@
+cave|cv
\ No newline at end of file
diff --git a/resources/dictionaries/pt/level_types_numbered.txt b/resources/dictionaries/pt/level_types_numbered.txt
new file mode 100644
index 00000000..759bb6e0
--- /dev/null
+++ b/resources/dictionaries/pt/level_types_numbered.txt
@@ -0,0 +1 @@
+andar
\ No newline at end of file
diff --git a/resources/dictionaries/pt/level_types_standalone.txt b/resources/dictionaries/pt/level_types_standalone.txt
new file mode 100644
index 00000000..f46dfcf2
--- /dev/null
+++ b/resources/dictionaries/pt/level_types_standalone.txt
@@ -0,0 +1 @@
+rés-do-chão|res-do-chao|rés do chão|res do chao|résdochão|resdochao|rc|r / c|r.c|r c|rdc|r / d / c|r-d-c|r d c |r.d.c
\ No newline at end of file
diff --git a/resources/dictionaries/pt/level_types_sub_basement.txt b/resources/dictionaries/pt/level_types_sub_basement.txt
new file mode 100644
index 00000000..80c5dcef
--- /dev/null
+++ b/resources/dictionaries/pt/level_types_sub_basement.txt
@@ -0,0 +1 @@
+sub cave|scv
\ No newline at end of file
diff --git a/resources/dictionaries/pt/number.txt b/resources/dictionaries/pt/number.txt
index 5e133b83..07202f94 100644
--- a/resources/dictionaries/pt/number.txt
+++ b/resources/dictionaries/pt/number.txt
@@ -1 +1 @@
-número|numero|no|nº|n|nrº|nro|nmro|nmrº
\ No newline at end of file
+número|#|num|núm|no|numero|№|nº|n.º|númr|numr|númro|numro|núm.ro|nr|num.ro|nro|n.ro|nr.º|nmro|nmr.o|nmrº|nmr.º
\ No newline at end of file
diff --git a/resources/dictionaries/pt/place_names.txt b/resources/dictionaries/pt/place_names.txt
index 45314cea..f7b437a6 100644
--- a/resources/dictionaries/pt/place_names.txt
+++ b/resources/dictionaries/pt/place_names.txt
@@ -14,6 +14,11 @@ casal|csl
 castelo|cast
 centro comercial|cc|c.c.|c.c|c c
 ciclo do ensino básico|ciclo do ensino basico|ceb|c.e.b.|c.e.b|c e b
+departamento|dep|depto
+departamentos|deps|deptos
+escadaria
+escadas|esc
+escadinhas|escnh
 escola
 escola básica|escola basica|eb|e.b.|e.b|e b
 estação|estacao
@@ -29,8 +34,9 @@ fonte|f.te|fte
 galeria|gal
 guarda nacional republicana|gnr|g.n.r.|g.n.r|g n r
 instituto|inst
-loja
-lojas
+loja|lj
+lojas|ljs
+loteamento|loteam
 museu|mus
 parque|pq|prq|parq
 pavilhão|pailhao|pav
diff --git a/resources/dictionaries/pt/post_office.txt b/resources/dictionaries/pt/post_office.txt
new file mode 100644
index 00000000..974e99c9
--- /dev/null
+++ b/resources/dictionaries/pt/post_office.txt
@@ -0,0 +1,2 @@
+apartado
+caixa postal|cp|c.p|c p
\ No newline at end of file
diff --git a/resources/dictionaries/pt/synonyms.txt b/resources/dictionaries/pt/synonyms.txt
index 28664a1e..a2bcbac8 100644
--- a/resources/dictionaries/pt/synonyms.txt
+++ b/resources/dictionaries/pt/synonyms.txt
@@ -1,10 +1,12 @@
 abril|abr
+batalhao|btl
 agosto|ago
 dezembro|dezbro|dezbr.o|dezb.ro|dez.bro|dez|10bro|10.bro|10b.ro|10br.o
 educacao|educ
 fevereiro|fev|fevro|fev.ro
 informacao|inf|inform
 janeiro|janero|janro|janr.o|jan.ro|jan
+jardim|jrd|jard|jd
 junho|jun
 julho|jul
 março|mar
@@ -13,6 +15,7 @@ monte|mnt|mte|mnte
 liberdade|liberde|liberd.e
 novembro|9bro|9.bro|9b.ro|9br.o|nov
 outubro|8bro|8.bro|8b.ro|8br.o|out
+pátio|patio|pto
 ribeira|ra|r.a|riba|ribra|ribr.a
 ribeiro|ro|r.o|ribo|ribro|ribr.o
 setembro|7bro|7.bro|7b.ro|7br.o|set
\ No newline at end of file
diff --git a/resources/dictionaries/pt/toponyms.txt b/resources/dictionaries/pt/toponyms.txt
index 9dbdfb8d..761eb3d0 100644
--- a/resources/dictionaries/pt/toponyms.txt
+++ b/resources/dictionaries/pt/toponyms.txt
@@ -1 +1,28 @@
-lisboa|lxa|lx.a|lex.a|lexa
\ No newline at end of file
+lisboa|lxa|lx.a|lex.a|lexa
+acre|ac
+alagoas|al
+amapá|amapa|ap
+amazonas|am
+bahia|ba
+ceará|ceara|ce
+distrito federal|df
+espírito santo|espirito santo|es
+goiás|goias|go
+maranhão|maranhao|ma
+mato grosso|mt
+mato grosso do sul|ms
+minas gerais|mg
+pará|para|pa
+paraíba|paraiba|pb
+paraná|parana|pr
+pernambuco|pe
+piauí|piaui|pi
+rio de janeiro|rj
+rio grande do norte|rn
+rio grande do sul|rs
+rondônia|rondonia|ro
+roraima|rr
+santa catarina|sc
+são paulo|sao paulo|sp
+sergipe|se
+tocantins|to
\ No newline at end of file
diff --git a/resources/dictionaries/pt/unit_directions.txt b/resources/dictionaries/pt/unit_directions.txt
new file mode 100644
index 00000000..8dbb536f
--- /dev/null
+++ b/resources/dictionaries/pt/unit_directions.txt
@@ -0,0 +1,4 @@
+direito|dir|dto
+esquerdo|esq
+frente|ft
+traseiro|tras
\ No newline at end of file
diff --git a/resources/dictionaries/pt/unit_types.txt b/resources/dictionaries/pt/unit_types.txt
deleted file mode 100644
index 6f199b55..00000000
--- a/resources/dictionaries/pt/unit_types.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-andar
-apartamento|apt|apto|apt.o
-batalhao|btl
-cave|cv
-condominio
-departamento|dep|depto
-departamentos|deps|deptos
-direito|dto
-escadas|esc
-escadinhas|escnh
-esquerdo|esq
-frente|ft
-habitação|habitacao|hab
-jardim|jrd|jard|jd
-loja|lj
-lojas|ljs
-lote|lt
-loteamento|loteam
-pátio|patio|pto
-quarta
-quarto|qt|qto
-rés-do-chão|rés do chão|res-do-chao|res do chao|résdochão|resdochao|r / c|rc|r c
-residencia|res
-sala
-sobre loja|slj
-sub cave|scv
-terreiro
\ No newline at end of file
diff --git a/resources/dictionaries/pt/unit_types_numbered.txt b/resources/dictionaries/pt/unit_types_numbered.txt
new file mode 100644
index 00000000..6c59928e
--- /dev/null
+++ b/resources/dictionaries/pt/unit_types_numbered.txt
@@ -0,0 +1,6 @@
+apartamento|apt|apto|apt.o
+casa
+lote|lt
+parcela
+moradia
+sala
\ No newline at end of file
diff --git a/resources/dictionaries/pt/unit_types_standalone.txt b/resources/dictionaries/pt/unit_types_standalone.txt
new file mode 100644
index 00000000..23176422
--- /dev/null
+++ b/resources/dictionaries/pt/unit_types_standalone.txt
@@ -0,0 +1 @@
+sobre loja|slj
\ No newline at end of file
diff --git a/resources/dictionaries/ro/level_types.txt b/resources/dictionaries/ro/level_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/ro/level_types.txt
rename to resources/dictionaries/ro/level_types_numbered.txt
diff --git a/resources/dictionaries/ro/staircases.txt b/resources/dictionaries/ro/staircases.txt
new file mode 100644
index 00000000..5f515535
--- /dev/null
+++ b/resources/dictionaries/ro/staircases.txt
@@ -0,0 +1 @@
+scara|sc
\ No newline at end of file
diff --git a/resources/dictionaries/ro/unit_types.txt b/resources/dictionaries/ro/unit_types.txt
deleted file mode 100644
index 35e11242..00000000
--- a/resources/dictionaries/ro/unit_types.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-apartament|ap
-scara|sc
\ No newline at end of file
diff --git a/resources/dictionaries/ro/unit_types_numbered.txt b/resources/dictionaries/ro/unit_types_numbered.txt
new file mode 100644
index 00000000..0401d170
--- /dev/null
+++ b/resources/dictionaries/ro/unit_types_numbered.txt
@@ -0,0 +1 @@
+apartament|ap
\ No newline at end of file
diff --git a/resources/dictionaries/ru/unit_types.txt b/resources/dictionaries/ru/unit_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/ru/unit_types.txt
rename to resources/dictionaries/ru/unit_types_numbered.txt
diff --git a/resources/dictionaries/sv/unit_types_numbered.txt b/resources/dictionaries/sv/unit_types_numbered.txt
new file mode 100644
index 00000000..38c15784
--- /dev/null
+++ b/resources/dictionaries/sv/unit_types_numbered.txt
@@ -0,0 +1 @@
+lägenhet|laegenhet|lgh
\ No newline at end of file
diff --git a/resources/dictionaries/tr/level_types_numbered.txt b/resources/dictionaries/tr/level_types_numbered.txt
new file mode 100644
index 00000000..4704a6d1
--- /dev/null
+++ b/resources/dictionaries/tr/level_types_numbered.txt
@@ -0,0 +1 @@
+kat|k
\ No newline at end of file
diff --git a/resources/dictionaries/tr/unit_types.txt b/resources/dictionaries/tr/unit_types_numbered.txt
similarity index 50%
rename from resources/dictionaries/tr/unit_types.txt
rename to resources/dictionaries/tr/unit_types_numbered.txt
index 662ca898..c26fdf5e 100644
--- a/resources/dictionaries/tr/unit_types.txt
+++ b/resources/dictionaries/tr/unit_types_numbered.txt
@@ -1,3 +1,2 @@
 apartman|apt
-daire|d
-kat|k
\ No newline at end of file
+daire|d
\ No newline at end of file
diff --git a/resources/dictionaries/uk/unit_types.txt b/resources/dictionaries/uk/unit_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/uk/unit_types.txt
rename to resources/dictionaries/uk/unit_types_numbered.txt
diff --git a/resources/dictionaries/zh/level_types.txt b/resources/dictionaries/zh/level_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/zh/level_types.txt
rename to resources/dictionaries/zh/level_types_numbered.txt
diff --git a/resources/dictionaries/zh/unit_types.txt b/resources/dictionaries/zh/unit_types_numbered.txt
similarity index 100%
rename from resources/dictionaries/zh/unit_types.txt
rename to resources/dictionaries/zh/unit_types_numbered.txt