diff --git a/resources/dictionaries/be/house_numbers.txt b/resources/dictionaries/be/house_numbers.txt
new file mode 100644
index 00000000..0ac079e3
--- /dev/null
+++ b/resources/dictionaries/be/house_numbers.txt
@@ -0,0 +1,2 @@
+дом|д
+dom|d
\ No newline at end of file
diff --git a/resources/dictionaries/be/unit_types.txt b/resources/dictionaries/be/unit_types_numbered.txt
similarity index 65%
rename from resources/dictionaries/be/unit_types.txt
rename to resources/dictionaries/be/unit_types_numbered.txt
index 7fc51b79..b599771d 100644
--- a/resources/dictionaries/be/unit_types.txt
+++ b/resources/dictionaries/be/unit_types_numbered.txt
@@ -1,4 +1,2 @@
-дом|д
-dom|d
 кватэра|кв
 kvatera|kv
\ No newline at end of file
diff --git a/resources/dictionaries/bg/entrances.txt b/resources/dictionaries/bg/entrances.txt
new file mode 100644
index 00000000..5a961ae8
--- /dev/null
+++ b/resources/dictionaries/bg/entrances.txt
@@ -0,0 +1,2 @@
+вход|вх
+vkhod|vkh
\ No newline at end of file
diff --git a/resources/dictionaries/bg/unit_types.txt b/resources/dictionaries/bg/unit_types_numbered.txt
similarity index 69%
rename from resources/dictionaries/bg/unit_types.txt
rename to resources/dictionaries/bg/unit_types_numbered.txt
index 3b15026d..e330b13e 100644
--- a/resources/dictionaries/bg/unit_types.txt
+++ b/resources/dictionaries/bg/unit_types_numbered.txt
@@ -1,5 +1,3 @@
-вход|вх
-vkhod|vkh
 апартамент|ап
 apartament|ap
 стая
diff --git a/resources/dictionaries/ca/entrances.txt b/resources/dictionaries/ca/entrances.txt
new file mode 100644
index 00000000..3b47ef70
--- /dev/null
+++ b/resources/dictionaries/ca/entrances.txt
@@ -0,0 +1 @@
+entrada|entr|entd
\ No newline at end of file
diff --git a/resources/dictionaries/ca/level_types_basement.txt b/resources/dictionaries/ca/level_types_basement.txt
new file mode 100644
index 00000000..a8031e2e
--- /dev/null
+++ b/resources/dictionaries/ca/level_types_basement.txt
@@ -0,0 +1 @@
+soterrani|so
\ No newline at end of file
diff --git a/resources/dictionaries/ca/level_types.txt b/resources/dictionaries/ca/level_types_mezzanine.txt
similarity index 100%
rename from resources/dictionaries/ca/level_types.txt
rename to resources/dictionaries/ca/level_types_mezzanine.txt
diff --git a/resources/dictionaries/ca/level_types_numbered.txt b/resources/dictionaries/ca/level_types_numbered.txt
new file mode 100644
index 00000000..46f500e0
--- /dev/null
+++ b/resources/dictionaries/ca/level_types_numbered.txt
@@ -0,0 +1,2 @@
+pis
+planta|pl
\ No newline at end of file
diff --git a/resources/dictionaries/ca/level_types_standalone.txt b/resources/dictionaries/ca/level_types_standalone.txt
new file mode 100644
index 00000000..51b8852b
--- /dev/null
+++ b/resources/dictionaries/ca/level_types_standalone.txt
@@ -0,0 +1,5 @@
+àtic|àt|atic|at
+baixos|bxs
+planta baixa|pb
+principal|pr|pral
+sobreàtic|s / àt|s / at|sobreatic|s àt|s at
\ No newline at end of file
diff --git a/resources/dictionaries/ca/number.txt b/resources/dictionaries/ca/number.txt
new file mode 100644
index 00000000..5a405000
--- /dev/null
+++ b/resources/dictionaries/ca/number.txt
@@ -0,0 +1 @@
+número|núm|numero|num|n|#
\ No newline at end of file
diff --git a/resources/dictionaries/ca/place_names.txt b/resources/dictionaries/ca/place_names.txt
index 519b6a6e..1c5c318b 100644
--- a/resources/dictionaries/ca/place_names.txt
+++ b/resources/dictionaries/ca/place_names.txt
@@ -3,6 +3,7 @@ afers exteriors
 ajuntament
 alberg
 ambaixada
+aparcament|aparc
 apartaments
 arbreda
 atlètic|atletic
diff --git a/resources/dictionaries/ca/post_office.txt b/resources/dictionaries/ca/post_office.txt
new file mode 100644
index 00000000..d94cbc5a
--- /dev/null
+++ b/resources/dictionaries/ca/post_office.txt
@@ -0,0 +1 @@
+apartat|apt
\ No newline at end of file
diff --git a/resources/dictionaries/ca/postal_code.txt b/resources/dictionaries/ca/postal_code.txt
new file mode 100644
index 00000000..3b71fc16
--- /dev/null
+++ b/resources/dictionaries/ca/postal_code.txt
@@ -0,0 +1 @@
+codi postal|cp
\ No newline at end of file
diff --git a/resources/dictionaries/ca/qualifiers.txt b/resources/dictionaries/ca/qualifiers.txt
index 3aabce9d..d1a21cf4 100644
--- a/resources/dictionaries/ca/qualifiers.txt
+++ b/resources/dictionaries/ca/qualifiers.txt
@@ -5,4 +5,4 @@ districte|distr
 polígon|pol|poligon
 polígon industrial|pi|poligon industrial|pol ind
 punt quilomètric|punt quilometric|pk|p.k.|p k
-urbanització|urb|urbanitzacio
+urbanització|urb|urbanitzacio
\ No newline at end of file
diff --git a/resources/dictionaries/ca/staircases.txt b/resources/dictionaries/ca/staircases.txt
new file mode 100644
index 00000000..63648cb6
--- /dev/null
+++ b/resources/dictionaries/ca/staircases.txt
@@ -0,0 +1 @@
+escala|esc
\ No newline at end of file
diff --git a/resources/dictionaries/ca/street_types.txt b/resources/dictionaries/ca/street_types.txt
index 78040908..e01d2290 100644
--- a/resources/dictionaries/ca/street_types.txt
+++ b/resources/dictionaries/ca/street_types.txt
@@ -1,8 +1,8 @@
 autopista|auto|autop
 autovia|autov
-avinguda|av|avd|avda
+avinguda|av|avd|avda|avgda
 camí|cami
-carrer|carr
+carrer|carr|c /
 carrera|cra|carra
 carreró|cró|carrero|cro|carro|carr
 carretera|ctra
diff --git a/resources/dictionaries/ca/unit_directions.txt b/resources/dictionaries/ca/unit_directions.txt
new file mode 100644
index 00000000..51d9a34b
--- /dev/null
+++ b/resources/dictionaries/ca/unit_directions.txt
@@ -0,0 +1,2 @@
+dreta|d|dta
+esquerra|e
\ No newline at end of file
diff --git a/resources/dictionaries/ca/unit_types.txt b/resources/dictionaries/ca/unit_types.txt
deleted file mode 100644
index 5f539237..00000000
--- a/resources/dictionaries/ca/unit_types.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-aparcament|aparc
-apartament|apmt
-apartat|apt
-àtic|àt|atic|at
-dreta|dta
-entrada|entr
-escala|esc
-esquerra
-habitació|hab|habitacio
-número|núm|numero|num|n|#
-parcel·la|parc|parcella
-porta|pta
-sobreàtic|s / àt|s / at|sobreatic|s àt|s at
\ No newline at end of file
diff --git a/resources/dictionaries/ca/unit_types_numbered.txt b/resources/dictionaries/ca/unit_types_numbered.txt
new file mode 100644
index 00000000..61ec64d5
--- /dev/null
+++ b/resources/dictionaries/ca/unit_types_numbered.txt
@@ -0,0 +1,4 @@
+apartament|apmt|apt
+habitació|hab|habitacio
+parcel·la|parc|parcella
+porta|pta
\ No newline at end of file
diff --git a/resources/dictionaries/da/level_types.txt b/resources/dictionaries/da/level_types.txt
deleted file mode 100644
index f47f4750..00000000
--- a/resources/dictionaries/da/level_types.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-kælderetage|kaelderetage|kl
-stueetage|st
\ No newline at end of file
diff --git a/resources/dictionaries/da/level_types_basement.txt b/resources/dictionaries/da/level_types_basement.txt
new file mode 100644
index 00000000..56aebf5e
--- /dev/null
+++ b/resources/dictionaries/da/level_types_basement.txt
@@ -0,0 +1 @@
+kælderetage|kaelderetage|kl
\ No newline at end of file
diff --git a/resources/dictionaries/da/level_types_standalone.txt b/resources/dictionaries/da/level_types_standalone.txt
new file mode 100644
index 00000000..1570840c
--- /dev/null
+++ b/resources/dictionaries/da/level_types_standalone.txt
@@ -0,0 +1 @@
+stueetage|st
\ No newline at end of file
diff --git a/resources/dictionaries/da/number.txt b/resources/dictionaries/da/number.txt
new file mode 100644
index 00000000..8b4bbfae
--- /dev/null
+++ b/resources/dictionaries/da/number.txt
@@ -0,0 +1 @@
+nummer|numero|no|#
\ No newline at end of file
diff --git a/resources/dictionaries/da/place_names.txt b/resources/dictionaries/da/place_names.txt
index a4db4b9a..a0f93d41 100644
--- a/resources/dictionaries/da/place_names.txt
+++ b/resources/dictionaries/da/place_names.txt
@@ -2,5 +2,6 @@ akademi|akad
 bro
 broen
 centralpark
+departement|dep
 gaard|gård
 park
\ No newline at end of file
diff --git a/resources/dictionaries/da/unit_types.txt b/resources/dictionaries/da/unit_types.txt
deleted file mode 100644
index 49a92b75..00000000
--- a/resources/dictionaries/da/unit_types.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-departement|dep
-lejlighed|lejl
-nummer|numero|no|#
\ No newline at end of file
diff --git a/resources/dictionaries/da/unit_types_numbered.txt b/resources/dictionaries/da/unit_types_numbered.txt
new file mode 100644
index 00000000..fc69191d
--- /dev/null
+++ b/resources/dictionaries/da/unit_types_numbered.txt
@@ -0,0 +1 @@
+lejlighed|lejl
\ No newline at end of file
diff --git a/resources/dictionaries/de/level_types.txt b/resources/dictionaries/de/level_types_basement.txt
similarity index 100%
rename from resources/dictionaries/de/level_types.txt
rename to resources/dictionaries/de/level_types_basement.txt
diff --git a/resources/dictionaries/de/level_types_numbered.txt b/resources/dictionaries/de/level_types_numbered.txt
new file mode 100644
index 00000000..58f99d00
--- /dev/null
+++ b/resources/dictionaries/de/level_types_numbered.txt
@@ -0,0 +1 @@
+obergeschoss|og|o g
\ No newline at end of file
diff --git a/resources/dictionaries/de/level_types_standalone.txt b/resources/dictionaries/de/level_types_standalone.txt
new file mode 100644
index 00000000..a4dfba22
--- /dev/null
+++ b/resources/dictionaries/de/level_types_standalone.txt
@@ -0,0 +1 @@
+erdgeschoss|eg|e g
\ No newline at end of file
diff --git a/resources/dictionaries/de/number.txt b/resources/dictionaries/de/number.txt
new file mode 100644
index 00000000..5fedd5cd
--- /dev/null
+++ b/resources/dictionaries/de/number.txt
@@ -0,0 +1 @@
+nummer|nr|#
\ No newline at end of file
diff --git a/resources/dictionaries/de/post_office.txt b/resources/dictionaries/de/post_office.txt
new file mode 100644
index 00000000..c4a99de9
--- /dev/null
+++ b/resources/dictionaries/de/post_office.txt
@@ -0,0 +1 @@
+postfach|pf
\ No newline at end of file
diff --git a/resources/dictionaries/de/staircases.txt b/resources/dictionaries/de/staircases.txt
new file mode 100644
index 00000000..b3ba5503
--- /dev/null
+++ b/resources/dictionaries/de/staircases.txt
@@ -0,0 +1 @@
+stiege|stg
\ No newline at end of file
diff --git a/resources/dictionaries/de/unit_types.txt b/resources/dictionaries/de/unit_types.txt
deleted file mode 100644
index 93a81dc1..00000000
--- a/resources/dictionaries/de/unit_types.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-abteilung|abt
-buro
-nummer|nr|#
-stiege|stg
-wohnung|whg
-zahl|z
-zimmer|zi
\ No newline at end of file
diff --git a/resources/dictionaries/de/unit_types_numbered.txt b/resources/dictionaries/de/unit_types_numbered.txt
new file mode 100644
index 00000000..f7b3fdbf
--- /dev/null
+++ b/resources/dictionaries/de/unit_types_numbered.txt
@@ -0,0 +1,5 @@
+abteilung|abt
+büro|buro|buero
+top
+wohnung|whg|w
+zimmer|zi
\ No newline at end of file
diff --git a/resources/dictionaries/en/staircase.txt b/resources/dictionaries/en/staircases.txt
similarity index 100%
rename from resources/dictionaries/en/staircase.txt
rename to resources/dictionaries/en/staircases.txt
diff --git a/resources/dictionaries/es/staircase.txt b/resources/dictionaries/es/staircases.txt
similarity index 100%
rename from resources/dictionaries/es/staircase.txt
rename to resources/dictionaries/es/staircases.txt
diff --git a/resources/dictionaries/et/number.txt b/resources/dictionaries/et/number.txt
new file mode 100644
index 00000000..fcbf7b26
--- /dev/null
+++ b/resources/dictionaries/et/number.txt
@@ -0,0 +1 @@
+number|nr|no|#
\ No newline at end of file
diff --git a/resources/dictionaries/et/place_names.txt b/resources/dictionaries/et/place_names.txt
index d06a7051..32227640 100644
--- a/resources/dictionaries/et/place_names.txt
+++ b/resources/dictionaries/et/place_names.txt
@@ -1,11 +1,13 @@
 akadeemia
 farmaatsia|farm
 instituut|inst
+jaoskond|jsk
 keskkool|kk
 kooli
 ministeerium|min
 observatoorium|obs
 organisatsioon|org
+osakond|osk
 pargi
 raamatukogu|rmtk
 raamatukauplus|rmtkpl
diff --git a/resources/dictionaries/et/unit_types.txt b/resources/dictionaries/et/unit_types.txt
deleted file mode 100644
index 853adde6..00000000
--- a/resources/dictionaries/et/unit_types.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-jaoskond|fsk
-korteer|k
-number|nr|no|#
-osakond|osk
\ No newline at end of file
diff --git a/resources/dictionaries/et/unit_types_numbered.txt b/resources/dictionaries/et/unit_types_numbered.txt
new file mode 100644
index 00000000..258c49cd
--- /dev/null
+++ b/resources/dictionaries/et/unit_types_numbered.txt
@@ -0,0 +1 @@
+korter|k
\ No newline at end of file
diff --git a/resources/dictionaries/eu/unit_types.txt b/resources/dictionaries/eu/unit_directions.txt
similarity index 100%
rename from resources/dictionaries/eu/unit_types.txt
rename to resources/dictionaries/eu/unit_directions.txt
diff --git a/resources/dictionaries/fi/qualifiers.txt b/resources/dictionaries/fi/qualifiers.txt
index 9ebe8ae1..dc5e2f3b 100644
--- a/resources/dictionaries/fi/qualifiers.txt
+++ b/resources/dictionaries/fi/qualifiers.txt
@@ -1 +1,2 @@
+kerrostalo
 palveluta
\ No newline at end of file
diff --git a/resources/dictionaries/fi/staircases.txt b/resources/dictionaries/fi/staircases.txt
new file mode 100644
index 00000000..7901b30d
--- /dev/null
+++ b/resources/dictionaries/fi/staircases.txt
@@ -0,0 +1,3 @@
+porraskäytäva|porraskaytava
+porras
+rappu
\ No newline at end of file
diff --git a/resources/dictionaries/fi/unit_types.txt b/resources/dictionaries/fi/unit_types.txt
deleted file mode 100644
index 005fcef9..00000000
--- a/resources/dictionaries/fi/unit_types.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-asunto|as
-bostad|bst
-kerostallo
-porras
\ No newline at end of file
diff --git a/resources/dictionaries/fi/unit_types_numbered.txt b/resources/dictionaries/fi/unit_types_numbered.txt
new file mode 100644
index 00000000..dc2c2118
--- /dev/null
+++ b/resources/dictionaries/fi/unit_types_numbered.txt
@@ -0,0 +1 @@
+asunto|as
\ No newline at end of file
diff --git a/resources/dictionaries/fr/place_names.txt b/resources/dictionaries/fr/place_names.txt
index 9a71a7e8..3dceb9a5 100644
--- a/resources/dictionaries/fr/place_names.txt
+++ b/resources/dictionaries/fr/place_names.txt
@@ -114,7 +114,6 @@ pont
 ponts
 port
 poterne|pot|potrn
-porte|pte
 préscolaire|prescolaire
 prison
 refuge
diff --git a/resources/dictionaries/fr/staircase.txt b/resources/dictionaries/fr/staircases.txt
similarity index 100%
rename from resources/dictionaries/fr/staircase.txt
rename to resources/dictionaries/fr/staircases.txt
diff --git a/resources/dictionaries/fr/unit_directions.txt b/resources/dictionaries/fr/unit_directions.txt
index b225b32f..06654755 100644
--- a/resources/dictionaries/fr/unit_directions.txt
+++ b/resources/dictionaries/fr/unit_directions.txt
@@ -1,4 +1,4 @@
 arrière|arriere
 avant
 gauche|g
-droit
\ No newline at end of file
+droit|dr
\ No newline at end of file
diff --git a/resources/dictionaries/fr/unit_types.txt b/resources/dictionaries/fr/unit_types.txt
deleted file mode 100644
index 4d4599af..00000000
--- a/resources/dictionaries/fr/unit_types.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-appartement|app
-département|departement|dept
-escalier|esc
-escaliers|escs
-jardin|jard|jrd
-jardins|jards|jrds
-porche|pch|prch
-résidence|residence|rés|res
-résidences|residences
\ No newline at end of file
diff --git a/resources/dictionaries/gl/unit_types.txt b/resources/dictionaries/gl/unit_directions.txt
similarity index 100%
rename from resources/dictionaries/gl/unit_types.txt
rename to resources/dictionaries/gl/unit_directions.txt
diff --git a/resources/dictionaries/hr/unit_types.txt b/resources/dictionaries/hr/staircases.txt
similarity index 100%
rename from resources/dictionaries/hr/unit_types.txt
rename to resources/dictionaries/hr/staircases.txt
diff --git a/resources/dictionaries/hu/level_types_numbered.txt b/resources/dictionaries/hu/level_types_numbered.txt
new file mode 100644
index 00000000..19b28af9
--- /dev/null
+++ b/resources/dictionaries/hu/level_types_numbered.txt
@@ -0,0 +1 @@
+emelet
\ No newline at end of file
diff --git a/resources/dictionaries/hu/unit_types.txt b/resources/dictionaries/hu/staircases.txt
similarity index 100%
rename from resources/dictionaries/hu/unit_types.txt
rename to resources/dictionaries/hu/staircases.txt
diff --git a/resources/dictionaries/it/number.txt b/resources/dictionaries/it/number.txt
new file mode 100644
index 00000000..e0fe07b0
--- /dev/null
+++ b/resources/dictionaries/it/number.txt
@@ -0,0 +1 @@
+numero|nº|no|n.º|n.o|n|#
\ No newline at end of file
diff --git a/resources/dictionaries/it/unit_types.txt b/resources/dictionaries/it/unit_types.txt
index e6341a68..3ce19bf3 100644
--- a/resources/dictionaries/it/unit_types.txt
+++ b/resources/dictionaries/it/unit_types.txt
@@ -7,7 +7,6 @@ dipartimento|dipart.o|dpmto
 edificio|edif.o|edifo
 garage|g.ge|gge
 giardino|g.no|gno
-numero|nº|no|n.º|n.o|n|#
 officina|off.a|off
 palazzo|pal.zo|palzo
-piano|pº|p.º|p.o|p.nº|p.no|pnº|pno
+piano|pº|p.º|p.o|p.nº|p.no|pnº|pno
\ No newline at end of file
diff --git a/resources/dictionaries/mt/unit_types.txt b/resources/dictionaries/mt/number.txt
similarity index 100%
rename from resources/dictionaries/mt/unit_types.txt
rename to resources/dictionaries/mt/number.txt
diff --git a/resources/dictionaries/pt/number.txt b/resources/dictionaries/pt/number.txt
new file mode 100644
index 00000000..5e133b83
--- /dev/null
+++ b/resources/dictionaries/pt/number.txt
@@ -0,0 +1 @@
+número|numero|no|nº|n|nrº|nro|nmro|nmrº
\ No newline at end of file
diff --git a/resources/dictionaries/pt/unit_types.txt b/resources/dictionaries/pt/unit_types.txt
index 71174373..6f199b55 100644
--- a/resources/dictionaries/pt/unit_types.txt
+++ b/resources/dictionaries/pt/unit_types.txt
@@ -15,7 +15,6 @@ jardim|jrd|jard|jd
 loja|lj
 lojas|ljs
 lote|lt
-número|numero|no|nº|n|nrº|nro|nmro|nmrº
 loteamento|loteam
 pátio|patio|pto
 quarta
diff --git a/resources/dictionaries/ru/building_types.txt b/resources/dictionaries/ru/building_types.txt
index a530ad8c..c4ac3a2c 100644
--- a/resources/dictionaries/ru/building_types.txt
+++ b/resources/dictionaries/ru/building_types.txt
@@ -1,4 +1,2 @@
-дом|д
-dom|d
 корпус|к
 korpus|k
\ No newline at end of file
diff --git a/resources/dictionaries/ru/house_numbers.txt b/resources/dictionaries/ru/house_numbers.txt
new file mode 100644
index 00000000..0ac079e3
--- /dev/null
+++ b/resources/dictionaries/ru/house_numbers.txt
@@ -0,0 +1,2 @@
+дом|д
+dom|d
\ No newline at end of file
diff --git a/resources/dictionaries/tr/number.txt b/resources/dictionaries/tr/number.txt
new file mode 100644
index 00000000..5fa1cd20
--- /dev/null
+++ b/resources/dictionaries/tr/number.txt
@@ -0,0 +1,2 @@
+numara|no|no:|no :
+numarala|nolu
\ No newline at end of file
diff --git a/resources/dictionaries/tr/unit_types.txt b/resources/dictionaries/tr/unit_types.txt
index c19ba5a1..662ca898 100644
--- a/resources/dictionaries/tr/unit_types.txt
+++ b/resources/dictionaries/tr/unit_types.txt
@@ -1,5 +1,3 @@
 apartman|apt
 daire|d
-kat|k
-numara|no|no:|no :
-numarala|nolu
\ No newline at end of file
+kat|k
\ No newline at end of file