diff --git a/data/dictionaries/all/place_names.txt b/data/dictionaries/all/place_names.txt
new file mode 100644
index 00000000..5f808388
--- /dev/null
+++ b/data/dictionaries/all/place_names.txt
@@ -0,0 +1,18 @@
+arby's|arbys
+burger king
+chick-fil-a|chick fil a|chickfila
+chipotle
+domino's pizza|domino's|dominos pizza|dominos
+dunkin' donuts|dunkin donuts
+five guys
+jack in the box
+kentucky fried chicken|kfc|k f c
+mcdonald's|mcdonalds
+panda express
+papa john's|papa johns
+pizza hut
+sonic
+subway
+taco bell
+wendy's|wendys
+whataburger|what a burger
\ No newline at end of file
diff --git a/data/dictionaries/bg/personal_titles.txt b/data/dictionaries/bg/personal_titles.txt
index 0b4be5d1..afc92afd 100644
--- a/data/dictionaries/bg/personal_titles.txt
+++ b/data/dictionaries/bg/personal_titles.txt
@@ -1,7 +1,14 @@
 доктор|д-р|др
+doktor|d-r|dr
 доцент|доц
+dotsent|dots
 генерал|ген
+general|gen
 капитан|кап
+kapitan|kap
 митрополит|мит
+mitropolit|mit
 професор|проф
-свети|св
\ No newline at end of file
+profesor|prof
+свети|св
+sveti|sv
\ No newline at end of file
diff --git a/data/dictionaries/bg/qualifiers.txt b/data/dictionaries/bg/qualifiers.txt
index 454619cd..92bf510f 100644
--- a/data/dictionaries/bg/qualifiers.txt
+++ b/data/dictionaries/bg/qualifiers.txt
@@ -1,5 +1,10 @@
 Блок|Бл
+blok|bl
 село|с
+selo|s
 град|гр
+grad|gr
 квартал|кв
-жилищен комплекс|ж.к.|жк|ж к
\ No newline at end of file
+kvartal|kv
+жилищен комплекс|ж.к.|жк|ж к
+zhilishten kompleks|z.k.|zk|z k
\ No newline at end of file
diff --git a/data/dictionaries/bg/street_types.txt b/data/dictionaries/bg/street_types.txt
index 5e00b248..1f20274e 100644
--- a/data/dictionaries/bg/street_types.txt
+++ b/data/dictionaries/bg/street_types.txt
@@ -1,3 +1,6 @@
 Булевард|бул
+bulevard|bul
 площад|пл
-улица|ул
\ No newline at end of file
+ploshtad|pl
+улица|ул
+ulitsa|ul
\ No newline at end of file
diff --git a/data/dictionaries/bg/unit_types.txt b/data/dictionaries/bg/unit_types.txt
index c20940c9..3b15026d 100644
--- a/data/dictionaries/bg/unit_types.txt
+++ b/data/dictionaries/bg/unit_types.txt
@@ -1,3 +1,6 @@
 вход|вх
+vkhod|vkh
 апартамент|ап
-стая
\ No newline at end of file
+apartament|ap
+стая
+staya
\ No newline at end of file
diff --git a/data/dictionaries/ca/given_names.txt b/data/dictionaries/ca/given_names.txt
new file mode 100644
index 00000000..27afb3ba
--- /dev/null
+++ b/data/dictionaries/ca/given_names.txt
@@ -0,0 +1 @@
+maria|mª|m.a|m.ª
\ No newline at end of file
diff --git a/data/dictionaries/ca/personal_titles.txt b/data/dictionaries/ca/personal_titles.txt
index c2f56639..122b84e1 100644
--- a/data/dictionaries/ca/personal_titles.txt
+++ b/data/dictionaries/ca/personal_titles.txt
@@ -1,6 +1,10 @@
+doctor|dr
+doctora|dra
+don|d
+dona|dª|dna|d.a|d.ª
 mestre
 mossèn|mn|mossen
 pintor
 poeta
 sant|st
-santa|sta
\ No newline at end of file
+santa|stª|st.ª|sta|st.a
\ No newline at end of file
diff --git a/data/dictionaries/ca/place_names.txt b/data/dictionaries/ca/place_names.txt
index 666a8800..ddbc75bd 100644
--- a/data/dictionaries/ca/place_names.txt
+++ b/data/dictionaries/ca/place_names.txt
@@ -1,7 +1,7 @@
 biblioteca|bibl
 cementiri|cem
-collegi|col·legi|col·l|coll
-collegi públic|cp|col·legi públic|collegi public|col·legi public
+col·legi|col·l|collegi|coll
+col·legi públic|cp|collegi públic|collegi public|col·legi public
 comissaria|com
 convent|convt
 correus|corr
diff --git a/data/dictionaries/ca/qualifiers.txt b/data/dictionaries/ca/qualifiers.txt
index f87087af..0f873978 100644
--- a/data/dictionaries/ca/qualifiers.txt
+++ b/data/dictionaries/ca/qualifiers.txt
@@ -2,6 +2,7 @@ barri|b
 bloc|bl
 cantonada|cant
 districte|distr
-poligon|pol
-poligon industrial|pi|pol ind
+polígon|pol|poligon
+polígon industrial|pi|poligon industrial|pol ind
+punt quilomètric|punt quilometric|pk
 urbanització|urb|urbanitzacio
\ No newline at end of file
diff --git a/data/dictionaries/ca/stopwords.txt b/data/dictionaries/ca/stopwords.txt
index 9cfb7791..fbc06ff6 100644
--- a/data/dictionaries/ca/stopwords.txt
+++ b/data/dictionaries/ca/stopwords.txt
@@ -16,13 +16,14 @@ entre
 i
 l'
 la
-las
 les
+li
 lo
 los
 na
 prop de
 sa
+se
 ses
 sobre
 sota
diff --git a/data/dictionaries/ca/street_types.txt b/data/dictionaries/ca/street_types.txt
index fb928368..1111fe18 100644
--- a/data/dictionaries/ca/street_types.txt
+++ b/data/dictionaries/ca/street_types.txt
@@ -1,7 +1,7 @@
 autopista|auto|autop
 autovia|autov
 avinguda|av|avd|avda
-cami
+camí|cami
 carrer|carr
 carreró|cró|carrero|cro|carro|carr
 carretera|ctra
@@ -14,7 +14,7 @@ gran via|gv|g v
 passadís|pdís|passadis|pdis
 passatge|ptge
 passeig|pg
-plaça|pl|placa|pca|pça
+plaça|pl|placa|pça|pca|plç|plc
 portal|ptal
 rambla|rbla
 ronda|rda
diff --git a/data/dictionaries/ca/unit_types.txt b/data/dictionaries/ca/unit_types.txt
index ceae6293..5f539237 100644
--- a/data/dictionaries/ca/unit_types.txt
+++ b/data/dictionaries/ca/unit_types.txt
@@ -5,8 +5,9 @@ apartat|apt
 dreta|dta
 entrada|entr
 escala|esc
+esquerra
 habitació|hab|habitacio
 número|núm|numero|num|n|#
-parcella|parcel·la|parc
+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/data/dictionaries/de/academic_degrees.txt b/data/dictionaries/de/academic_degrees.txt
index eb722d57..a1b4fb65 100644
--- a/data/dictionaries/de/academic_degrees.txt
+++ b/data/dictionaries/de/academic_degrees.txt
@@ -1,5 +1,5 @@
 diplom ingenieur|dipl ing
 diplom kaufmann|dipl kfm
-doktor de medizin|dr med
+doktor der medizin|dr med
 doktor der philosophie|dr phil
 magister|mag
\ No newline at end of file
diff --git a/data/dictionaries/de/company_types.txt b/data/dictionaries/de/company_types.txt
index eef78453..e4f761fb 100644
--- a/data/dictionaries/de/company_types.txt
+++ b/data/dictionaries/de/company_types.txt
@@ -1,8 +1,8 @@
 ag|aktiengesellschaft
-eingetragener verein|e v
+eingetragener verein|ev|e v
 firma|fa
-fussball club|fc|f c
-gmbh|gesellschaft mit beschrankter haftung
+fußball club|fussball club|fc|f c
+gmbh|gesellschaft mit beschränkter haftung|gesellschaft mit beschrankter haftung|gesellschaft mit beschraenkter haftung
 gesellschaft|ges
 kg|kommanditgesellschaft
 ohg|offene handelsgesellschaft
\ No newline at end of file
diff --git a/data/dictionaries/de/concatenated_prefixes_separable.txt b/data/dictionaries/de/concatenated_prefixes_separable.txt
index d41caa53..a8156786 100644
--- a/data/dictionaries/de/concatenated_prefixes_separable.txt
+++ b/data/dictionaries/de/concatenated_prefixes_separable.txt
@@ -1,5 +1,17 @@
 hinter
+hintere
+hinterer
 klein
+kleine
+kleiner
 ober
+obere
+oberen
+oberer
 unter
-vorder
\ No newline at end of file
+untere
+unteren
+unterer
+vorder
+vordere
+vorderes
\ No newline at end of file
diff --git a/data/dictionaries/de/concatenated_suffixes_separable.txt b/data/dictionaries/de/concatenated_suffixes_separable.txt
index 2dd6044e..329ad7e7 100644
--- a/data/dictionaries/de/concatenated_suffixes_separable.txt
+++ b/data/dictionaries/de/concatenated_suffixes_separable.txt
@@ -1,5 +1,5 @@
 allee
-brucke|br.
+brücke|br.|brucke|bruecke
 burgermeister|bgm.
 damm
 gasse
@@ -10,6 +10,6 @@ quelle|qu|q.
 rundwanderweg|rww.
 siedlung|sdlg.
 stiege|stg.
-strasse|str.
+straße|str.|strasse
 weg|w.
 wiese|ws.
\ No newline at end of file
diff --git a/data/dictionaries/de/directionals.txt b/data/dictionaries/de/directionals.txt
index e0d25a97..bffe95ce 100644
--- a/data/dictionaries/de/directionals.txt
+++ b/data/dictionaries/de/directionals.txt
@@ -1,17 +1,41 @@
 nord|n
 norden
-nordliche|nordl
+nördlich|nördl|nordl|nordlich|noerdlich
+nördliche|nordliche|noerdliche
+nördlicher|nordlicher|noerdlicher
+nördliches|nordliches|noerdliches
 nordost|no
+nordosten
+nordöstlich|nordostlich|nordoestlich
 nordwest|nw
+nordwestliche
 ost|o
 osten
-ostliche|ostl
-suden|s
-sudliche|sudl
-sudost|so
-sudosten
-sudwest|sw
-sudwesten
+östlich|östl|ostlich|ostl|oestlich
+östliche|ostliche|oestliche
+östlicher|ostlicher|oestlicher
+östliches|ostliches|oestliches
+süd|s|sud|sued
+süden|suden|sueden
+südlich|südl|sudl|sudlich|suedlich
+südliche|sudliche|suedliche
+südlicher|sudlicher|suedlicher
+südliches|sudliches|suedliches
+südost|so|sudost|suedost
+südosten|sudosten|suedosten
+südöstlich|sudostlich|suedoestlich
+südöstliche|sudostliche|suedoestliche
+südöstlicher|sudostlicher|suedoestlicher
+südöstliches|sudostliches|suedoestliches
+südwest|sw|sudwest|suedwest
+südwesten|sudwesten|suedwesten
+südwestlich|sudwestlich|suedwestlich
+südwestliche|sudwestliche|suedwestliche
+südwestlicher|sudwestlicher|suedwestlicher
+südwestliches|sudwestliches|suedwestliches
 west|w
 westen
-westliche|westl
\ No newline at end of file
+westlich|westl
+westliche
+westlicher
+westliches
\ No newline at end of file
diff --git a/data/dictionaries/de/personal_titles.txt b/data/dictionaries/de/personal_titles.txt
index 8899d9d0..e44dab74 100644
--- a/data/dictionaries/de/personal_titles.txt
+++ b/data/dictionaries/de/personal_titles.txt
@@ -1,5 +1,5 @@
 doktor|dr
-burgermeister|bgm
+bürgermeister|buergermeister|burgermeister|bgm
 direktor|dir
 frau|fr
 fraulein|fri
diff --git a/data/dictionaries/de/place_names.txt b/data/dictionaries/de/place_names.txt
index 9b8c332c..ea5f1e86 100644
--- a/data/dictionaries/de/place_names.txt
+++ b/data/dictionaries/de/place_names.txt
@@ -15,21 +15,25 @@ fachhochschule|fh
 freiwillige feuerwehr|ff
 gasthaus|gh
 gasthof|ghf
+grundschule
 hafen
 haus
 handelsakademie|hak
 handelsschule|hasch
 hauptbahnhof|hbf
-hohle
-hohere technische lehranstalt|htl|h t l
+höhle|hohle
+höhere technische lehranstalt|htl|hohere technische lehranstalt|hoehere technische lehranstalt|h t l
 hotel
-hutte|htt
+hütte|hutte|huette|htt
+imbiss
 jagdhaus
 jagdhutte|jhtt
 jungenherberge|jh|j h
 kaffee
+kantine
 kapelle|kap|kpl
-klaranlage|ka
+kirche
+kläranlage|ka|klaranlage|klaeranlage
 konzentrationslager|kz|kl
 magistratsabteilung|ma
 markt|mkt
@@ -42,12 +46,13 @@ sportplatz|sport platz|sport pl|sportpl
 resevoir|res
 restaurant
 ruine
+ruinen
 schloss|schl
 steinbruch|stb
-technische universitat|tu|t u
-truppenubungsplatz|tupl
-universitat|uni
-universitatsbibliothek|ub|u b
+technische universität|tu|t u|technische universitat|technische universitaet
+truppenubüngsplatz|tüpl|tupl|truppenubungsplatz|truppenubuengsplatz
+universität|uni|universitat|universitaet
+universitätsbibliothek|ub|u b|universitatsbibliothek|universitaetsbibliothek
 volksschule|vs
 wald
 wasserfall|wsf|wssf
diff --git a/data/dictionaries/de/street_types.txt b/data/dictionaries/de/street_types.txt
index a5ad235d..c1c0939b 100644
--- a/data/dictionaries/de/street_types.txt
+++ b/data/dictionaries/de/street_types.txt
@@ -4,16 +4,16 @@ bach
 bad
 bahnhof|bhf|bf
 boulevard|bd
-brucke|bruecke|br
+brücke|br|brucke|bruecke
 buhl|buehl
 chaussee|ch
 damm|d
 forsthaus|fh
 gasse|g
 graben|gr
-grosser
-grosse|gr|g
-grosses
+großser|grosser
+große|grosse|gr|g
+großes|grosses
 heiligen
 hof|h
 kamp|k
@@ -27,7 +27,7 @@ pfad
 platz|pl
 quelle|qu
 rundwanderweg|rww
-strasse|str
+straße|str|strasse
 untere|u
 unterer
 unteres
diff --git a/data/dictionaries/de/toponyms.txt b/data/dictionaries/de/toponyms.txt
index cbeffd80..a783ad30 100644
--- a/data/dictionaries/de/toponyms.txt
+++ b/data/dictionaries/de/toponyms.txt
@@ -1,2 +1,17 @@
-burgenlaendische|burgenlandische|bgld
+burgenländische|burgenlaendische|burgenlandische|bgld
+niederösterreichisch|nö|niederosterreichisch|niederoesterreichisch
+niederösterreichische|niederosterreichische|niederoesterreichische
+niederösterreichischer|niederosterreichischer|niederoesterreichischer
+niederösterreichisches|niederosterreichisches|niederoesterreichisches
+oberösterreichisch|oö|oberosterreichisch|oberoesterreichisch
+oberösterreichische|oberosterreichische|oberoesterreichische
+oberösterreichischer|oberosterreichischer|oberoesterreichischer
+oberösterreichisches|oberosterreichisches|oberoesterreichisches
+österreichisch|österr|öst.|osterreichisch|oesterreichisch
+österreichische|osterreichische|oesterreichische
+österreichischer|osterreichischer|oesterreichischer
+österreichisches|osterreichisches|oesterreichisches
+österreichischer alpenverein|öav|oav|osterreichischer alpenverein|oesterreichischer alpenverein
+österreichischer gebirgsverein|ögb|ogb|osterreichischer gebirgsverein|oesterreichischer gebirgsverein
+österreichischer touristenklub|ötk|otk|osterreichischer touristenklub|oesterreichischer touristenklub
 wiener|wr
\ No newline at end of file
diff --git a/data/dictionaries/el/street_types.txt b/data/dictionaries/el/street_types.txt
index d589fa51..1a8de2eb 100644
--- a/data/dictionaries/el/street_types.txt
+++ b/data/dictionaries/el/street_types.txt
@@ -1,4 +1,3 @@
-
 οδός
 odós|odos|odhos
 λεωφόρος
diff --git a/data/dictionaries/en/place_names.txt b/data/dictionaries/en/place_names.txt
index 4ac105c4..ef8081e1 100644
--- a/data/dictionaries/en/place_names.txt
+++ b/data/dictionaries/en/place_names.txt
@@ -1,46 +1,101 @@
+academy
 aged care center|aged care centre|aged care|centre for aged care|center for aged care|center for the aged|centre for the aged|aged care facilities
+amphitheatre|amphitheater
+animal hospital|animal hosp
 air force base|afb
 air national guard base|angb
 airport|aerodome|aprt
 apartments|apts|appartments
+aquarium
 arms
+art gallery|arts gallery
+arts center
+arts centre
+auditorium
 bakery
 bank
+bar
 barn
+barbecue|barbeque|bar be que|bar be cue|bbq
 barracks|barrack|baracks
-bhouse|bh|board house|boarding house
+bazaar
+boarding house|bhouse|bh|board house
+bistro
 book store|bookstore
-cafe
-caravan park|carvn|cvp|caravn park|c park|c van|car park|caravan resort|van park|caratel|caravan par|carav park|carvn park|cara park|cvan park
+brewery
+cafe|café
+campus
+caravan park|carvn|cvp|caravn park|c van park|cvan park|caravan resort|van park|caratel|caravan par|carav park|carvn park|cara park
+car park|carpark
+car wash|carwash
+casino
 castle|cst
+cemetery
+center for the arts|centre for the arts
+child care|childcare
+chiropractic
 church|chr
+cinema
+cinemas
+cineplex
 circus|crcs|crc
+city hall
 clinic
 club|clb
+clubhouse|club house
+coffee
 college
 committee
 community center|communitycentre|communitycenter|community centre
 community|cmnty|cmty
-convalescent|convalescent center|convalescent centre|convalescent home|convalescent hospital
+concert hall
+conservatory
+convalescent center|convalescent|convalescent centre|convalescent home|convalescent hospital
+correctional facility
 cottage|cott|cottg
 cottages|cotts|cottgs
 country club|country clb|cty clb
+courthouse|court house
+creamery
+credit union
+culture center|culture centre
+cultural center|cultural centre
 dam|dm
+dance studio
+day care
+deli|delicatessen
 dental
 dentist
+dentistry
 detention|det|detn
+diner
+distillery
 distributor|dstr|distrib|dstrb
 district|dist
+doctors
 elementary school|primary school|public school|ps|p s
+embassy
 ex services complex
+factory|fty
+family practice
+farmer's market|farmers market
 farm|frm
 farmhouse
+fire department|fd|f d
+fire station
 forge
+fountain
+gaol
 garage
 gallery
+gas station
 geriatric unit
+graveyard|grave yard
+grill
+gym|gymnasium
 hall
-home|h|hm|hme|hom
+headquarters
+home|hm|hme|hom
 homes
 home for the aged
 hospital|hos|hosp|hospice|hosptl|hsp|hsptl
@@ -49,68 +104,137 @@ hostel|host|hostl|hstel|hstl
 hotel|hot|hotl|htel
 hostel
 house
+ice cream|icecream
 industrial|ind
 inn
 institute|inst
-jail|gaol|prison|penitentiary
+jail
+jcc|jewish community center|jewish community centre
 jetty|jtty|jty
+kennel
 kindergarten
+kitchen
 league
 library
 lodge|ldge|lodg
+lounge
 mall|mll
 maison
 manor|mnr
 market|mkt
+marketplace|mktpl|mktplc
 mansion
 mansions
 masonic home
 masonic homes
 medical|med
+memorial
 military|mil
 mission|msn
 monastery|monastry
 motel|mot|motl|mtel
+municipal building|municipal bldg
 museum|mus
+music hall
+night club|nightclub
 nursing
 nursing center|nursing centre
 nursing home|nh|nhome|nrs|nrsg|nsg|nurs|nrsng hm|n h|nrs home|n home|nursing hom|nursing ho|nursing h
 high school|hs|secondary school
 international|intl
 junior high school|jr high school|jhs
+laboratory
+lab
+labs
+market|mkt
 middle school|ms
+movie theater
+movie theatre
 national park|np|natl park|natl pk
 national recreation area|nra|natl rec area
 national wildlife refuge area|nwra|natl wildlife refuge
 nurses home|nurses home|nurse home
+nursery
 office|ofc
 offices|ofcs
 office tower|ofc twr|office twr|ofc tower
 office towers|ofc twrs|office twrs|ofc towers
+opera house
+parish
+parking lot
+pavilion
 pharmacy
-pre school|preschool
+pediatric
+penitentiary
+performing arts centre
+performing arts center
+pharmacy
+playhouse
+police department|pd|p d
+police station
+polytechnic
+post office
 precinct
+pre school|preschool|pre-school
+pre-kindergarten|prekindergarten|pre-k|prek|pre k
+primary school
+primary care
+prison
 pub
+public pool
 public school|ps
+recycling
 retreat|rtt
 rotary|rty
 resevoir|res
 restaurant
 retirement home|retirement village|ret village|masonic retirement village|retirement|ret vill|retirement home|retirement v|rh|r h
-shopping center|shoppingcenter|shoppingcentre|shopping|shoppingtown|shopping centre|shopping 
+roadhouse
+roller rink
+saloon
+salon
 sanctuary|sanct
+sauna
+secondary school
+shelter
+sheriff's department|sherrifs department|sheriff's dept|sherrifs dept
+sherrif's office|sherffis office|sheriff's ofc|sheriffs ofc
+shopping center|shoppingcenter|shoppingcentre|shopping|shoppingtown|shopping centre|shopping 
 shop|shp
 sisters
+social club
 spa
-square
+stables
+stadium
 station|sta|stn
+steakhouse
 store|stor
+studio
+studios
+swimming pool
+tavern
+tea
 terminal|term
+theater
+theatre
+theatres
+theaters
 tower|twr
-town
+town hall
+townhouse|town house
 townhouses|town houses
 university|uni|univ|univers|unvrsty
 units
+urgent care
+vet
+veterinary
+veterinarian
+veterinarians
+vets
 villa|vll
 villas|vlls
-village|vil|vge|vill|villag|villg|vlg|vlge|vllg|villages|vlgs
\ No newline at end of file
+village|vil|vge|vill|villag|villg|vlg|vlge|vllg|villages|vlgs
+wine bar|winebar
+winery
+yoga
+youth center|youth centre
\ No newline at end of file
diff --git a/data/dictionaries/es/building_types.txt b/data/dictionaries/es/building_types.txt
index dfd2ad78..fe8a0f62 100644
--- a/data/dictionaries/es/building_types.txt
+++ b/data/dictionaries/es/building_types.txt
@@ -1,4 +1,4 @@
-caserio|csrio
+caserío|caserio|csrio
 casa
 chalet|chlet
 complejo|compj|compl|complj
diff --git a/data/dictionaries/es/company_types.txt b/data/dictionaries/es/company_types.txt
index fe44aa86..7ae565be 100644
--- a/data/dictionaries/es/company_types.txt
+++ b/data/dictionaries/es/company_types.txt
@@ -1,28 +1,29 @@
-asociacion en participacion|a en p
-asociacion civil|ac|a c
+asociación en participación|asociacion en participacion|a en p
+asociación civil|asociacion civil|ac|a c
 banco|bco|b.co
-club atletico
-club de futbol|cf|c f|c.f.|c.f|futbol club|fc|f.c.|f.c|f c
-compania|cia|c.ia|ca|c.a|comp
-compania anonima|ca|c a
-compania por acciones|c por a|cxa|c x a
+club atlético|club atletico
+club de fútbol|club de futbol|cf|c f|c.f.|c.f
+compañia|compania|cia|c.ia|ca|c.a|comp
+compañia anónima|compania anonima|ca|c a
+compañia por acciónes|compania por acciones|c por a|cxa|c x a
 empresa|empr|emp
 empresa individual de responsabilidad limitada|eirl|e i r l
 empresa publica|ep|e.p.|e.p|e p
 empresa unipersonal|e.u.|e.u|e u
+fútbol club|futbol club|fc|f.c.|f.c|f c|football club
 sociedad|sdad|s.dad|soc
-sociedad anonima|sa|s.a.|s.a|s a|sdad anon
-sociedad anonima abierta|saa|s.a.a.|s.a.a|s a a
-sociedad anonima bursatil|sab|s.a.b.|s.a.b|s a b
-sociedad anonima deportiva|sad|s.a.d.|s.a.d|s a d
-sociedad anonima de capital variable|sa de cv|s a de c v
-sociedad anonima cooperativa catalana limitada|sccl|s.c.c.l.|s.c.c.l|s c c l
-sociedad anonima espanola|sae|s.a.e.|s.a.e|s a e
-sociedad anonima financiera de inversion|safi|s.a.f.i.|s.a.f.i|s a f i
-sociedad anonima inscrita de capital abierto|saica|s.a.i.c.a.|s.a.i.c.a|s a i c a
-sociedad anonima laboral|sal|s.a.l.|s.a.l|s a l
-sociedad anonima promotora de inversion|sapi|s.a.p.i.|s.a.p.i|s a p i
-sociedad anonima simplificada|sas|s.a.s.|s.a.s|s a s
+sociedad anónima|sociedad anonima|sa|s.a.|s.a|s a|sdad anon
+sociedad anónima abierta|sociedad anonima abierta|saa|s.a.a.|s.a.a|s a a
+sociedad anónima bursatil|sociedad anonima bursatil|sab|s.a.b.|s.a.b|s a b
+sociedad anónima deportiva|sociedad anonima deportiva|sad|s.a.d.|s.a.d|s a d
+sociedad anónima de capital variable|sociedad anonima de capital variable|sa de cv|s a de c v
+sociedad anónima cooperativa catalana limitada|sociedad anonima cooperativa catalana limitada|sccl|s.c.c.l.|s.c.c.l|s c c l
+sociedad anónima española|sociedad anonima espanola|sae|s.a.e.|s.a.e|s a e
+sociedad anónima finciera de inversión|sociedad anonima financiera de inversion|safi|s.a.f.i.|s.a.f.i|s a f i
+sociedad anónima inscrita de capital abierto|sociedad anonima inscrita de capital abierto|saica|s.a.i.c.a.|s.a.i.c.a|s a i c a
+sociedad anónima laboral|sociedad anonima laboral|sal|s.a.l.|s.a.l|s a l
+sociedad anónima promotora de inversión|sociedad anonima promotora de inversion|sapi|s.a.p.i.|s.a.p.i|s a p i
+sociedad anónima simplificada|sociedad anonima simplificada|sas|s.a.s.|s.a.s|s a s
 sociedad civil|sc|s.c.|s.c|s c
 sociedad colectiva|snc|s n c|soc cal|y cia sc|y cia s c|& cia sc|& cia s c
 sociedad comanditaria|scra|s cra
@@ -33,16 +34,16 @@ sociedad de garantia reciproca|sgr|s.g.r.|s.g.r|s g r
 sociedad de responsabilidad limitada|srl|s.r.l.|s.r.l|s r l|s de rl|s de r l
 sociedad del estado|se|s.e.|s.e|s e
 sociedad en comandita|s en c|sc|y cia s en c|& cia s en c
-sociedad en comandita por acciones|s en c por a|sca|s c a|cia sca|cia s c a
+sociedad en comandita port acciónes|sociedad en comandita por acciones|s en c por a|sca|s c a|cia sca|cia s c a
 sociedad en nombre colectivo|cia|s en nc|s en n c
 sociedad en nombre colectivo de responsabilidad limitada|cia ltda|ltda
-sociedad gestora de instituciones de inversion colectiva|sgiic|s g i i c
+sociedad gestora de instituciones de inversión colectiva|sociedad gestora de instituciones de inversion colectiva|sgiic|s g i i c
 sociedad limitada|sl|s l|s.l.|s.l|sdad ltda
 sociedad limitada laboral|sll|s.l.l.|s.l.l|s l l
 sociedad limitada nueva empresa|slne|s.l.n.e.|s.l.n.e|s l n e
 sociedad limitada unipersonal|slu|s.l.u.|s.l.u|s l u
-sociedad por acciones|spa|s.p.a.|s.p.a|s p a
-union deportiva|ud|u.d.|u.d|u d
-union
-y compania|& compania|y cia|& cia
+sociedad port acciónes|sociedad por acciones|spa|s.p.a.|s.p.a|s p a
+unión deportiva|union deportiva|ud|u.d.|u.d|u d
+unión|union
+y compañia|y compania|& compania|& compañia|y cia|& cia
 y sucesores|& sucesores
\ No newline at end of file
diff --git a/data/dictionaries/es/directionals.txt b/data/dictionaries/es/directionals.txt
index ca5d4270..ba2cc73f 100644
--- a/data/dictionaries/es/directionals.txt
+++ b/data/dictionaries/es/directionals.txt
@@ -2,8 +2,11 @@ este|e
 norte|n
 noreste|nordeste|ne|n.e.|n.e|n e
 noroeste|nw|n.w.|n.w|n w
+occidente
+occidental
 oeste|w
 oriente|ote
+oriental
 poniente|pte
 sur|s
 sureste|se|s.e.|s.e|s e
diff --git a/data/dictionaries/es/given_names.txt b/data/dictionaries/es/given_names.txt
index 34981095..590e4afb 100644
--- a/data/dictionaries/es/given_names.txt
+++ b/data/dictionaries/es/given_names.txt
@@ -1,3 +1,3 @@
-federico|fco
-francisco|fco|franc
-maria|ma|m.a
\ No newline at end of file
+federico|fco|fcº
+francisco|fco|fcº|franc
+maria|mª|m.a|m.ª
\ No newline at end of file
diff --git a/data/dictionaries/es/personal_titles.txt b/data/dictionaries/es/personal_titles.txt
index 7a70046b..6dbb461e 100644
--- a/data/dictionaries/es/personal_titles.txt
+++ b/data/dictionaries/es/personal_titles.txt
@@ -5,14 +5,14 @@ administrador|admor|adm.or|admr
 administradora|admora|adm.ora|admra
 agrimensor|agrim
 alcalde|alcde
-alferez|alf|alfz
+alférez|alf|alferez|alfz
 almirante|alm|almte|alte
 alteza
 arquitecto|arq
 arquitecta|arqa
 arquitectors|arqs|arqos
 arzobispo|arz
-baron|bar
+barón|barbaron
 baronesa
 brigadier|brg|bg|brig
 brigadier general|brg general|brg gral|brg genl|brg gnal|brg gn|bg general|bg gral|bg genl|bg gnal|bg gn|brig general|brig gral|brig genl|brig gnal|brig gn
@@ -21,9 +21,9 @@ cabo primero|cp|c.p.|c.p|c p
 cabo segundo|cs|c.s.|c.s|c s
 cabo tercero|ct|c.t.|c.t|c t
 cacique|cque
-capitan|cap|capt|ctn|cptn
+capitán|cap|capt|ctn|cptn|capitan
 cardenal|card|cnal
-clerigo|clg
+clérigo|clg|clerigo
 comandante|cmdt|cmte|comte|cte
 comisario|cmro
 conde|cde
@@ -40,7 +40,7 @@ directora|dira|dir.a
 doctor|dr
 doctora|dra
 don|d
-dona|da|dna|d.a
+doña|dona|dª|dna|d.a|d.ª
 dragoneante|dg
 duque|dq
 duquesa|dqsa|dqa
@@ -82,19 +82,19 @@ mayor de brigada|may brig|my brig
 mayor general|mg|m.g.|m.g|m g|my gen|my gral
 ministerio|min
 ministro|mtro
-monsenor|mons|msnr
+monseñor|monsenor|mons|msnr
 notario|not
-nuestra senora|ns|n s|ntra sra
+nuestra señora|nuestra senora|ns|n s|ntra sra
 obispo|ob
 padre|pe|p.e|pdre|p.dre
 piloto fluvial|plto flvial
 presidenta|pdta|presa|pres.a|presida|presid.a|pta
 presidente|pdte|pres|presid|pte
-principe
+príncipe|principe
 principal|pral
 procurador|proc
 profesor|prof|profr
-profesora|profa|profra
+profesora|prof.ª|prof.a|profª|profa|profrª|profra
 reina|ra
 reverendo|rvdo|rdo|rvd|rev
 reverendo|rvdo|rdo|rvd|rev
@@ -103,9 +103,9 @@ reverendisimo|rmo|rvdmo
 rey
 reyes
 san|s
-santa|sta
+santa|stª|st.ª|sta|st.a
 sant|st
-santo|sto
+santo|stº|sto|st.o|st.º
 sargento|sarg|sgto|sargto
 sargento ayudante|sarg ay|sgto ay|sargto ay
 sargento mayor|sm|s.m.|s.m|s m|sarg my|sgto my|sargto my
@@ -115,10 +115,10 @@ sargento viceprimero|sargento vice primero|sv|s.v.|s.v|s v
 secretario|secreto|secto|sect.o
 secretaria|secreta|secta|sect.a
 senador|sen
-senor|sr
-senora|sra|s.ra
-senores|srs|sres|s.res
-senorita|srta|s.rta
+señor|sr|senor
+señora||sª|s.ª|srª|sra|sr.ª|s.ra|senora
+señores|srs|sres|s.res|senores
+señorita|srta|s.rta|senorita
 serenisima|serma|ser.ma
 serenisimo|sermo|ser.mo
 soldado|sold
diff --git a/data/dictionaries/es/place_names.txt b/data/dictionaries/es/place_names.txt
index df0378dc..58e70590 100644
--- a/data/dictionaries/es/place_names.txt
+++ b/data/dictionaries/es/place_names.txt
@@ -5,27 +5,29 @@ arboleda|arb
 arrabal|arral
 arroyo|arry
 asuntos exteriores|aa ee
-atletico|atlo
+atlético|atlo|atletico
 ayuntamiento
 balneario|balnr
+baños|banos
 banco
 bar
 biblioteca|bibl
 borda
-cafeteria
+café|cafe
+cafetería|cafeteria
 campo|cpo
 cantera|cantr
 cantina|canti
-caserio|csrio
+caserío|caserio|csrío|csrio
 casa
 casas
 castillo|cast
 cementerio
-charcuteria
+charcutería|charcuteria
 clinica
 club|clb
 colegio
-comisario de policia
+comisario de policía|comisario de policia
 correos
 corretaje
 convento|cnvto
@@ -37,16 +39,16 @@ diseminado|disem
 embajada
 escuela
 escuelas
-estacion|estcn
+estación|estacion|estcn
 estacionamiento|estto
-fabrica|fca|fbrca
+fábrica|fabrica|fca|fbrca
 farmacia
 ferrocarril|fc|f.c.|f.c|f c
 ferrocarriles|ff cc|ffcc
 granja|granj
 hacienda|hda
-heladeria
-hipodromo|hipod
+heladería|heladeria
+hipódromo|hipodromo|hipod
 horno
 hospital|hosp
 hostal
@@ -54,19 +56,19 @@ hotel
 iglesia|igl|igla
 iglesias|iglas
 instituto|inst
-libreria
+librería|libreria
 mercado|merc
 mirador|mrdor
 monasterio|mtrio
 muebles
 muelle|meull
-pabellon
+pabellón|pabellon
 palacio|palac
 palacios|palacs
-panaderia
+panadería|panaderia
 parque|pque|parq|pq|pqe
-pasteleria
-pescaderia
+pastelería|pasteleria
+pescadería|pescaderia
 pilar
 playa
 puebla|pbla
@@ -82,6 +84,7 @@ sociedad|soc
 taberna
 taller
 talleres
+templo
 tienda
 torre
 transito|trans
diff --git a/data/dictionaries/es/qualifiers.txt b/data/dictionaries/es/qualifiers.txt
index 5f7a4c8d..bd2990a4 100644
--- a/data/dictionaries/es/qualifiers.txt
+++ b/data/dictionaries/es/qualifiers.txt
@@ -10,10 +10,10 @@ distrito|dtto
 estado|edo
 isla|isl|is
 islas|isls|iss
-poligono|polig
-poligono residencial|polig res|pgres|pg res|pr|p.r.|p.r|p r
-poligono industrial|polig ind|pgind|pg ind|pi|p.i.|p.i|p i
-seccion|secc|sccn|scn|sec
+polígono|poligono|políg|polig
+polígono residencial|poligono residencial|políg res|polig res|pgres|pg res|pr|p.r.|p.r|p r
+polígono industrial|poligono industrial|políg ind|polig ind|pgind|pg ind|pi|p.i.|p.i|p i
+sección|seccion|secc|sccn|scn|sec
 sector|sect
-urbanizacion|urb
+urbanización|urbanizacion|urb
 zona|zna
\ No newline at end of file
diff --git a/data/dictionaries/es/street_types.txt b/data/dictionaries/es/street_types.txt
index a0e11337..aac54d8e 100644
--- a/data/dictionaries/es/street_types.txt
+++ b/data/dictionaries/es/street_types.txt
@@ -1,11 +1,11 @@
 acceso|acces
 alameda|alam
-alqueria|alque
+alquería|alqueria|alque
 andador|andad
 angosta|angta
 apeadero|apdro
 autopista|auto
-autovia|autov
+autovía|autovia|autov
 avenida|av|avd|avda
 bajada|bjada
 banda|bda
@@ -19,7 +19,7 @@ brazal|brzal
 bulevar|bulev|blev|blv|bv
 calle|c|cl|cll|c /|ca
 calleja|cllja
-callejon|callej|cjon|cllon|cj
+callejón|callejon|callej|cjon|cllon|cj
 calle privada|calle priv|c priv|cl priv|cll priv|c / priv
 callejuela|cjla
 callizo|cllzo
@@ -31,16 +31,16 @@ camino viejo|cv|c.v.|c.v|c v
 caminito|cmt
 camping|campg
 cantera|cantr
-canton|cant
+cantón|canton|cant
 carrera|cra|carra|carr
 carretera|ctra|cr
-carreterin|ctrin
+carreterín|carreterin|ctrin
 carretil|crtil
 carril|crril
 cerrada|cda|cer
-cinturon|cint
+cinturón|cinturon|cint
 circuito|cto
-circunvalacion|ccvcn
+circunvalación|circunvalacion|ccvcn
 corredor|crrdo
 costanilla|cstan
 costera
@@ -51,14 +51,14 @@ espalda|eslda
 estrada|estda
 explanada|expla
 extramuros|extrm
-galeria|gale
+galería|galeria|gale
 glorieta|gta|g
-gran via|gv|g v
+gran vía|gran via|gv|g v
 hacienda|hda
 ladera|ldera
 laderas|lderas
 llanura|llnra
-malecon|malec
+malecón|malecon|malec
 mirador|mrdor
 muelle|meull
 pantano|pant
@@ -68,7 +68,7 @@ particular|parti
 partida|ptda
 pasadizo|pzo
 pasaje|psaje|psj
-paseo|po|pso|pseo|ps|p|p.o
+paseo|pº|po|pso|pseo|ps|p|p.o|p.º
 paseo maritimo|psmar|ps mar
 paso
 pasillo|psllo
@@ -79,28 +79,27 @@ plazoleta|pzta|plzta|plta
 plazuela|plzla
 poblado|pbdo
 prazuela|przla
-prolongacion|prol
+prolongación|prolongacion|prol
 puebla|pbla
 pueblo|pblo
 puente|pnte
 rambla|rbla
-rampla|rampa
+rampla|rampa|rpla
 retorno|ret|rt
 ribera|bra
-rincon|rcon|rin|rncn|rncon
+rincón|rincon|rcon|rin|rncn|rncon
 rinconada|rcda|rcnda
 ronda|rda
 rotonda|rtda
-rua
 ruta|rta
 sector|sect
 sendera|sedra
 sendero|send|sedro
 subida|sbida
-transito|trans
+tránsito|transito|trans
 transversal|trval|trvsal
 trasera|tras
-travesia|trva|trvsia
+travesía|travesia|trva|trvsía|trvsia
 vereda|vreda|ver
 viaducto|vcto|vd
 via|v
diff --git a/data/dictionaries/es/surnames.txt b/data/dictionaries/es/surnames.txt
index 9f3d2855..265dbe9a 100644
--- a/data/dictionaries/es/surnames.txt
+++ b/data/dictionaries/es/surnames.txt
@@ -1,6 +1,6 @@
-fernandez|fdez
-lopez|lpez
-hernandez|hdez
-gonzalez|glez
-martinez|mnez
-rodriguez|rguez
\ No newline at end of file
+fernández|fernandez|fdez
+lópez|lopez|lpez
+hernández|hernandez|hdez
+gonzález|gonzalez|glez
+martínez|martinez|mnez
+rodríguez|rodriguez|rguez
\ No newline at end of file
diff --git a/data/dictionaries/es/synonyms.txt b/data/dictionaries/es/synonyms.txt
index b09572b5..3e175e09 100644
--- a/data/dictionaries/es/synonyms.txt
+++ b/data/dictionaries/es/synonyms.txt
@@ -1,5 +1,5 @@
 abril|abr|abl
-agosto|ag|agto|ag to|agt
+agosto|ag|agto|ag.to|agt
 altura|alt
 alturas|alts
 arboleda|arb
@@ -17,13 +17,13 @@ codigo postal|cp|c p
 distrito federal|df|d f
 distrito postal|dp|d p
 enero|en|eno|ene|en o
-diciembre|dic|dicbre|dic bre|dice|dic e|dbre|d bre|10bre|10 bre
-febrero|febo|feb o|febro|feb ro|febr|feb
-gobierno|gob|gobno|gob no
+diciembre|dic|dicbre|dic.bre|dice|dic.e|dbre|d.bre|10bre|10.bre|10 bre
+febrero|febo|feb.o|febro|feb.ro|febr|feb
+gobierno|gob|gobno|gob.no
 grande|gr
 guerra|ga
 independencia|indep
-infanteria|infa|ynfa|ynfanta
+infantería|infanteria|infa|ynfa|ynfanta
 junio|jun|jn
 julio|jul|jl
 lago|lg
@@ -37,8 +37,8 @@ militar|milr
 monte|mt|mte|mnte
 montes|mts|mtes|mntes|mnts
 nacional|nal|nacl
-noviembre|nbre|n bre|nvre|n vre|nove|nov e|novre|nov re|novbre|nov bre|9bre|9 bre
-octubre|oct|octbre|oct bre|octe|oct e|8bre|8 bre
+noviembre|nbre|n.bre|nvre|n.vre|nove|nov.e|novre|nov.re|novbre|nov.bre|9bre|9.bre|9 bre
+octubre|oct|octbre|oct.bre|octe|oct.e|8bre|8.bre|8 bre
 prado|prdo
 primeros|pros
 privada|priv
@@ -47,7 +47,8 @@ real|rl
 republica|rep
 revolucion|rev
 ribera|ribr
-septiembre|setbre|set bre|sepe|sep e|sepbre|sep bre|7bre|7 re|7 bre|sep|set
+río|rio
+septiembre|setbre|set.bre|sepe|sep.e|sepbre|sep.bre|7bre|7 re|7re|7.re|7 bre|7.bre|sep|set
 sierra|srra
 valle|vlle
 volcan|vlcn
diff --git a/data/dictionaries/es/toponyms.txt b/data/dictionaries/es/toponyms.txt
index a4542cb0..14dbfd0b 100644
--- a/data/dictionaries/es/toponyms.txt
+++ b/data/dictionaries/es/toponyms.txt
@@ -1,2 +1,2 @@
-barcelona|barna
-madd|madrid
\ No newline at end of file
+barcelona|barna|bar.na
+madrid|madd
\ No newline at end of file
diff --git a/data/dictionaries/es/unit_types.txt b/data/dictionaries/es/unit_types.txt
index ba2d7d8d..408163e5 100644
--- a/data/dictionaries/es/unit_types.txt
+++ b/data/dictionaries/es/unit_types.txt
@@ -6,34 +6,34 @@ corral|crral
 corralillo|crrlo
 cortijo|crtjo
 cuadra|cuadr
-demarcacion|demar
+demarcación|demarcacion|demar
 departamento|dept|depto
-derecha|dcha
+derecha|dcha|d
 diseminado|disem
 entrada|entd|entr
 escalera|esca
 escaleras|escas
 escalinata|escal|escalin
 estancias|estanc|est
-extension|ext
+extensión|extension|ext
 extramuros|extrm
 extrarradio|extrr
 interior|int
 izquierda|izq|izda|izqa|izqda
-jardin|jdin|jard
+jardín|jardin|jdin|jard
 jardines|jdins|jards
 mansion|mans
 mansiones|manses
-nucleo|ncleo
-numero|#|num|no|numr|numro|nro|n.ro
-officina|off
+núcleo|nucleo|ncleo
+número|numero|#|num|núm|no|númr|numr|númro|numro|núm.ro|num.ro|nro|n.ro
+oficina|of
 partida|ptda
 poblado|pbdo|pob|pobl
-poligono|polig
-poligono residencial|polig res|pgres|pg res|pr|p.r.|p.r|p r
-poligono industrial|polig ind|pgind|pg ind|pi|p.i.|p.i|p i
+polígono|poligono|políg|polig
+polígono residencial|poligono residencial|políg res|polig res|pgres|pg res|pr|p.r.|p.r|p r
+polígono industrial|poligono industrial|políg ind|polig ind|pgind|pg ind|pi|p.i.|p.i|p i
 portal|prtal|prtl
-portcio|prtco
+pórtico|portcio|prtco
 portillo|ptilo|ptllo
 puerta|pta
 quebrada|qbda
diff --git a/data/dictionaries/eu/qualifiers.txt b/data/dictionaries/eu/qualifiers.txt
new file mode 100644
index 00000000..2986ecf2
--- /dev/null
+++ b/data/dictionaries/eu/qualifiers.txt
@@ -0,0 +1 @@
+auzoa
\ No newline at end of file
diff --git a/data/dictionaries/eu/street_types.txt b/data/dictionaries/eu/street_types.txt
index 7a53a993..d08741d1 100644
--- a/data/dictionaries/eu/street_types.txt
+++ b/data/dictionaries/eu/street_types.txt
@@ -4,8 +4,9 @@ bide
 bidea
 bidexka
 enparantza
-etorbidea|etorb
 errepidea|err
+etorbidea|etorb
+hiribidea
 ibilbidea
 kalea|k
 kale
diff --git a/data/dictionaries/eu/unit_types.txt b/data/dictionaries/eu/unit_types.txt
new file mode 100644
index 00000000..f723885a
--- /dev/null
+++ b/data/dictionaries/eu/unit_types.txt
@@ -0,0 +1,2 @@
+ezkerkada
+zuzen
\ No newline at end of file
diff --git a/data/dictionaries/fr/building_types.txt b/data/dictionaries/fr/building_types.txt
index b8f0429d..63f7025b 100644
--- a/data/dictionaries/fr/building_types.txt
+++ b/data/dictionaries/fr/building_types.txt
@@ -1,4 +1,4 @@
-batiment|bat
+bâtiment|batiment|bat
 immeuble|imm
 maison
 villa|vla
\ No newline at end of file
diff --git a/data/dictionaries/fr/company_types.txt b/data/dictionaries/fr/company_types.txt
index 0089c122..041445a6 100644
--- a/data/dictionaries/fr/company_types.txt
+++ b/data/dictionaries/fr/company_types.txt
@@ -1,7 +1,7 @@
 association
 association sans but lucratif|asbl|a.s.b.l.|a.s.b.l|a s b l
 enterprise individuelle|ei|e.i.|e.i|e i
-enterprise unipersonnelle a responsabilite limitee|eurl|e.u.r.l.|e.u.r.l|e u r l
+enterprise unipersonnelle a responsabilité limitée|enterprise unipersonnelle a responsabilite limitee|eurl|e.u.r.l.|e.u.r.l|e u r l
 fondation
 fondation privee
 fondation d'utilite publique
@@ -12,29 +12,29 @@ groupe|gpe
 groupement|gpt
 groups|gps
 groupes|gpes
-groupement d'interet economique|groupement dinteret economique|gie|g.i.e.|g.i.e|g i e
+groupement d'intérêt économique|groupement dintérêt économique|groupement d'interet economique|groupement dinteret economique|gie|g.i.e.|g.i.e|g i e
 raison individuelle|ri|r.i.|r.i|r i
-societe anonyme|sa|s.a.|s.a|s a
-societe anonyme libanaise|sal|s.a.l.|s.a.l|s a l
-societe anonyme omanaise generale|saog|s.a.o.g.|s.a.o.g|s a o g
-societe anonyme omanaise close|saoc|s.a.o.c.|s.a.o.c|s a o c
-societe cooperative|scoop|s coop
-societe cooperative a responsabilite limitee|scrl|s.c.r.l.|s.c.r.l|s c r l
-societe cooperative a responsabilite illimitee|scri|s.c.r.i.|s.c.r.i|s c r i
-societe cooperative de production|scop|s.c.o.p.|s.c.o.p|s c o p
-societe d'economie mixte|societe d' economie mixte|societe deconomie mixte|sem|s.e.m.|s.e.m|s e m
-societe d'investissement a capital fixe|societe dinvestissement a capital fixe|societe d' investissement a capital fixe|sicaf|s.i.c.a.f.|s.i.c.a.f|s i c a f
-societe d'investissement a capital variable|societe dinvestissement a capital variable|societe d' investissement a capital variable|sicav|s.i.c.a.v.|s.i.c.a.v|s i c a v
-societe interne
-societe momentanee
-societe a responsabilite limitee|sarl|s.a.r.l.|s.a.r.l|s a r l
-societe en participation|sep|s.e.p.|s.e.p|s e p
-societe de fait
-societe en nom colletif|snc|s.n.c.|s.n.c|s n c
-societe en commandite|sc|s.c.|s.c|s c
-societe en commandite simple|scs|s.c.s.|s.c.s|s c s
-societe en commandite par actions|sca|s.c.a.|s.c.a|s c a
-societe par actions simplifiee|sas|s.a.s.|s.a.s|s a s
-societe privee a responsabilite limitee|sprl|s.p.r.l.|s.p.r.l|s p r l
-societe privee a responsabilite limitee unipersonnelle|sprlu|s.p.r.l.u.|s.p.r.l.u|s p r l u
-societe simple|ss|s.s.|s.s|s s
\ No newline at end of file
+sociéte anonyme|societe anonyme|sa|s.a.|s.a|s a
+sociéte anonyme libanaise|societe anonyme libanaise|sal|s.a.l.|s.a.l|s a l
+sociéte anonyme omanaise generale|societe anonyme omanaise generale|saog|s.a.o.g.|s.a.o.g|s a o g
+sociéte anonyme omanaise close|societe anonyme omanaise close|saoc|s.a.o.c.|s.a.o.c|s a o c
+sociéte coopérative|societe cooperative|scoop|s coop
+sociéte coopérative a responsabilité limitée|societe cooperative a responsabilite limitee|scrl|s.c.r.l.|s.c.r.l|s c r l
+sociéte coopérative a responsabilité illimitée|societe cooperative a responsabilite illimitee|scri|s.c.r.i.|s.c.r.i|s c r i
+sociéte coopérative de production|societe cooperative de production|scop|s.c.o.p.|s.c.o.p|s c o p
+sociéte d'économie mixte|societe d'economie mixte|sociéte d' économie mixte|societe d' economie mixte|sociéte déconomie mixte|societe deconomie mixte|sem|s.e.m.|s.e.m|s e m
+sociéte d'investissement a capital fixé|societe d'investissement a capital fixe|sociéte dinvestissement a capital fixé|societe dinvestissement a capital fixe|sociéte d' investissement a capital fixé|societe d' investissement a capital fixe|sicaf|s.i.c.a.f.|s.i.c.a.f|s i c a f
+sociéte d'investissement a capital variable|societe d'investissement a capital variable|sociéte dinvestissement a capital variable|societe dinvestissement a capital variable|sociéte d' investissement a capital variable|societe d' investissement a capital variable|sicav|s.i.c.a.v.|s.i.c.a.v|s i c a v
+sociéte interne|societe interne
+sociéte momentanée|societe momentanee
+sociéte a responsabilité limitée|societe a responsabilite limitee|sarl|s.a.r.l.|s.a.r.l|s a r l
+sociéte en participation|societe en participation|sep|s.e.p.|s.e.p|s e p
+sociéte de fait|societe de fait
+sociéte en nom collectif|societe en nom collectif|snc|s.n.c.|s.n.c|s n c
+sociéte en commandite|societe en commandite|sc|s.c.|s.c|s c
+sociéte en commandite simple|societe en commandite simple|scs|s.c.s.|s.c.s|s c s
+sociéte en commandite par actions|societe en commandite par actions|sca|s.c.a.|s.c.a|s c a
+sociéte par actions simplifiée|societe par actions simplifiee|sas|s.a.s.|s.a.s|s a s
+sociéte privée a responsabilité limitée|societe privee a responsabilite limitee|sprl|s.p.r.l.|s.p.r.l|s p r l
+sociéte privée a responsabilité limitée unipersonnelle|societe privee a responsabilite limitee unipersonnelle|sprlu|s.p.r.l.u.|s.p.r.l.u|s p r l u
+sociéte simple|societe simple|ss|s.s.|s.s|s s
\ No newline at end of file
diff --git a/data/dictionaries/fr/directionals.txt b/data/dictionaries/fr/directionals.txt
index a8de61d0..1785cfd7 100644
--- a/data/dictionaries/fr/directionals.txt
+++ b/data/dictionaries/fr/directionals.txt
@@ -1,7 +1,9 @@
 est|e
+levant
 nord|n
 nord est|ne|n.e.|n.e|n e
 nord ouest|no|n.o.|n.o|n o
+orient
 ouest|o
 sud|s
 sud est|se|s.e.|s.e|s e
diff --git a/data/dictionaries/fr/personal_titles.txt b/data/dictionaries/fr/personal_titles.txt
index 7e01812a..d3845536 100644
--- a/data/dictionaries/fr/personal_titles.txt
+++ b/data/dictionaries/fr/personal_titles.txt
@@ -8,33 +8,35 @@ comte|cte
 comtesse|ctesse
 docteur|dr
 docteurs|drs
-frere
-general|gal
+frère|frere
+général|general|gal
 lieutenant colonel|lt col
 lieutenant|lt
 madame|mme
 mesdames|mmes
 mademoiselle|mlle|mle
 mademoiselles|mlles|mles
-maitre|me
-maitres
+maître|maitre|me
+maîtres|maitres
+maîtresse|maitresse
 major|maj
-marechal|mal
+maréchal|marechal|mal
 marquis|mis
 marquise|mise
-messiuers|mm|mrs
+messieurs|mm|mrs
 monseigneur|mgr
 monsieur|m|mr
-pere
+père|pere
 professeur|prof|pr
 professeurs|profs|prs
-reverende pere|rp|r.p.|r.p|r p
-reverende pere jesuit|rpj|r.p.j.|r.p.j|r p j
+révérend
+révérend père|rp|r.p.|r.p|r p
+révérend père jésuit|reverende pere jesuit|rpj|r.p.j.|r.p.j|r p j
 sa saintete|ss|s.s.|s.s|s s
 saint|st
 sainte|ste
 son altesse|sa|s.a.|s.a|s a
-son altesse imperiale|sai|s.a.i.|s.a.i|s a i
+son altesse impériale|son altesse imperiale|sai|s.a.i.|s.a.i|s a i
 son altesse royale|sar|s.a.r.|s.a.r|s a r
 son eminence|s em
 son excellence|se|s.e.|s.e|s e|s exc
diff --git a/data/dictionaries/fr/place_names.txt b/data/dictionaries/fr/place_names.txt
index 2e1e8e78..0be488bb 100644
--- a/data/dictionaries/fr/place_names.txt
+++ b/data/dictionaries/fr/place_names.txt
@@ -1,22 +1,23 @@
 castel|cst
 centre commercial|cc|c.c.|c.c|c c
-chateau
+château|chateau
 cottage|cott
 cottages|cott|cotts
-eglise|egl
+église|eglise|egl|égl
 gare
 mont|mt|mnt|montagne
-musee|mus
+musée|musee|mus
 palais|pal
 parc|prc
 parc industriel
+péristyle|peristyle|psty
 pont
 ponts
 station|sta
 zone artisanale|za|z.a.|z.a|z a
 zone d'activites|zone dactivites|za|z.a.|z.a|z a
 zone artisanale commerciale|zac|z.a.c.|z.a.c|z a c
-zone d'amenagement concerte|zone damenagement concerte|zac|z.a.c.|z.a.c|z a c
-zone d'amenagement differe|zone damenagement differe|zad|z.a.d.|z.a.d|z a d
+zone d'aménagement concerté|zone d'amenagement concerte|zone daménagement concerté|zone damenagement concerte|zac|z.a.c.|z.a.c|z a c
+zone d'aménagement différé|zone d'amenagement differe|zone daménagement différé|zone damenagement differe|zad|z.a.d.|z.a.d|z a d
 zone industrielle|zi|z.i.|z.i|z i
-zone a urbaniser en priorite|zup|z.u.p.|z.u.p|z u p
\ No newline at end of file
+zone a urbaniser en priorité|zone a urbaniser en priorite|zup|z.u.p.|z.u.p|z u p
\ No newline at end of file
diff --git a/data/dictionaries/fr/post_office.txt b/data/dictionaries/fr/post_office.txt
index d6d9e6b2..9175d73c 100644
--- a/data/dictionaries/fr/post_office.txt
+++ b/data/dictionaries/fr/post_office.txt
@@ -1 +1 @@
-boite postale|bp|b.p.|b.p|b p
\ No newline at end of file
+boîte postale|boite postale|bp|b.p.|b.p|b p
\ No newline at end of file
diff --git a/data/dictionaries/fr/qualifiers.txt b/data/dictionaries/fr/qualifiers.txt
index f63b4fe1..5399c465 100644
--- a/data/dictionaries/fr/qualifiers.txt
+++ b/data/dictionaries/fr/qualifiers.txt
@@ -1,6 +1,6 @@
 canton|con
 faubourg|faub|fg
-ile
-iles
+île|ile
+îles|iles
 quartier|qua|qrt|qu
 zone|z
\ No newline at end of file
diff --git a/data/dictionaries/fr/stopwords.txt b/data/dictionaries/fr/stopwords.txt
index e3d4d659..5d60bbee 100644
--- a/data/dictionaries/fr/stopwords.txt
+++ b/data/dictionaries/fr/stopwords.txt
@@ -1,5 +1,5 @@
-a
-a cote de
+à|a
+à côté de|a cote de
 au
 aux
 avec
diff --git a/data/dictionaries/fr/street_types.txt b/data/dictionaries/fr/street_types.txt
index 1421cb5e..2e8de4cb 100644
--- a/data/dictionaries/fr/street_types.txt
+++ b/data/dictionaries/fr/street_types.txt
@@ -1,9 +1,9 @@
 abbaye|abe
-agglomeration|agl|agglom
+agglomeratión|agglomeration|agl|agglom
 aire
 aires
-allee|all
-allees|alls
+allée|allee|all
+allées|alls|allees
 ancien chemin|ach|a ch
 ancienne route|art
 anciennes routes|arts
@@ -12,13 +12,13 @@ arcade|arc
 autoroute|aut
 avenue|av|ave|aven|avenu|avn|avnu|avnue
 avenues|avs|aves|avens|avenus|avns|avnus|avnues
-barriere|bre
-barrieres|bres
+barriêre|barriere|bre
+barriêres|barrieres|bres
 bas chemin|bch|b ch
 bastide|bstd
 baston|bast
-beguinage|begi
-beguinages|begis
+béguinage|beguinage|begi
+béguinages|beguinages|begis
 berge|ber
 berges|bers
 bois
@@ -26,20 +26,20 @@ boucle|bcle
 boulevard|bd|bde|blv|blvd|blvde|blvrd|boulavard|boul|boulv|bvd|boulevarde|bld
 bourg|brg
 butte|but
-cite
-cites
-cote
-coteau
+cité|cite
+cités|cites
+côte|cote
+côteau|coteau
 cale
 camp
 campagne|cgne
 camping|cpg
 carreau|cau|carru
 carrefour|carf|carref
-carriere|care
-carrieres|cares
-carre|carr|car
-cavee|cav
+carrière|carriere|care
+carrières|carrieres|cares
+carré|carre|carr|car
+cavée|cavee|cav
 central|ctrl
 centre|c|ctre|cntre
 cercle|cercl
@@ -47,16 +47,16 @@ chalet|chl
 champ
 chapelle|chp
 charmille|chi
-chaussee|chs|chee
-chaussees|chss|chees
+chaussée|chaussee|chs|chee
+chaussées|chaussees|chss|chees
 chemin|ch|che
 chemin vicinal|chv|chev|ch v|che v
 cheminement|chem
 chemins|ches
 chemins vicinaux|chsv|chs v
 chez|chz
-chateau|cht
-cloitre|cloi
+château|chateau|cht
+cloître|cloitre|cloi
 clos
 col
 colline|coli
@@ -67,16 +67,16 @@ corniches|cors
 cour
 cours|crs
 darse|dars
-degre|deg
-degres|degs
+degré|degre|deg
+degrés|degres|degs
 descente|dsg
 descentes|dsgs
 digue|dig
 digues|digs
 domaine|dom
 domaines|doms
-ecluse|ecl
-ecluses|ecls
+écluse|ecluse|ecl
+écluses|ecluses|ecls
 enceinte|en
 enclave|env
 enclos|enc
@@ -85,7 +85,7 @@ escaliers|escs
 espace|espa
 esplanade|esp
 esplanades|esps
-etang
+étang|etang
 faubourg|fg|fbg
 ferme|frm
 fermes|frms
@@ -113,37 +113,35 @@ haut chemin|hch|h ch
 hauts chemins|hchs|h chs|hschs|hs chs
 hippodrome|hip
 hlm
-immeuble|imm
-immeubles|imms
 impasse|imp
 impasses|imps
 jardin|jard|jrd
 jardins|jards|jrds
-jetee|jte
-jetees|jtes
-levee|leve|lve
+jetée|jetee|jte
+jetées|jetees|jtes
+levée|levee|leve|lve
 lieu-dit|lieu dit|lieudit|ld|ldit|l dit|l-dit
 lotissement|lot
 lotissements|lots
 mail
-maison forestiere|mf|m.f.|m.f|m f
+maison forestière|maison forestiere|mf|m.f.|m.f|m f
 manoir|man
-marche|mar
-marches|mars
+marché|marche|mar
+marchés|marches|mars
 mas
 mont|mt|mnt|montagne
-montee|mte
-montees|mtes
+montée|montee|mte
+montées|montees|mtes
 moulin|mln
 moulins|mlns
-metro|met
+métro|metro|mét|met
 nouvelle route|nte
 parc|prc
 parcs|prcs
 parking|pkg
 parvis|prv
 passage|pas|psg
-passage a niveau|pn|p.n.|p.n|p n
+passage à niveau|passage a niveau|pn|p.n.|p.n|p n
 passe|pass
 passerelle|ple
 passerelles|ples
@@ -151,13 +149,14 @@ passes
 patio|pat
 pavillon|pav
 pavillons|pavs
+périphérique|peripherique|peri|péri
 petit chemin|p ch|p chemin|pt ch|pt chemin
-petite allee|pta|pt a|pt allee|p a|p allee
+petite allée|petite allee|pta|pt a|pt allee|p a|p allee
 petite avenue|pae|pt ae|pt ave|p ave|pt avn|p avn
 petite impasse|pim|p im|pt im|p impasse|pt impasse
 petite route|prt|p rt|pt rt|p route|pt route|p rte|pt rte
 petite rue|ptr|pt r|p rue|pt rue
-petites allees|ptas|pt as|pt allees|p a|p allees
+petite allées|petites allees|ptas|pt as|pt allees|p a|p allees
 place|pl
 placis|plci
 plage|plag
@@ -176,9 +175,9 @@ portique|porq|portq
 portiques|porqs|portqs
 poterne|pot|potrn
 pourtour|pour
-presqu'lle|prq|prql
+presqu’île|presquîle|presqu'ile|presquile|prq|prql
 promenade|prom
-pre
+pré|pre
 peripherique|peri
 peristyle|psty
 quai|au
@@ -216,7 +215,7 @@ tertes|trts
 tour
 traverse|tra|trvs|trvrs
 vallon|val
-vallee|val
+valée|vallee|val
 venelle|ven
 venelles|vens
 via
diff --git a/data/dictionaries/fr/synonyms.txt b/data/dictionaries/fr/synonyms.txt
index 791f53ca..579cecc1 100644
--- a/data/dictionaries/fr/synonyms.txt
+++ b/data/dictionaries/fr/synonyms.txt
@@ -2,4 +2,4 @@ fleuve|fl
 grand|gd|gr|g
 mont|mt
 petite|p|pt
-riviere|riv
\ No newline at end of file
+rivière|riviere|riv
\ No newline at end of file
diff --git a/data/dictionaries/fr/unit_types.txt b/data/dictionaries/fr/unit_types.txt
index 06c005a7..44105177 100644
--- a/data/dictionaries/fr/unit_types.txt
+++ b/data/dictionaries/fr/unit_types.txt
@@ -1,3 +1,4 @@
 appartement|app
-departement|dept
-residence|res
\ No newline at end of file
+département|departement|dept
+résidence|residence|rés|res
+résidences|residences
\ No newline at end of file
diff --git a/data/dictionaries/gl/directionals.txt b/data/dictionaries/gl/directionals.txt
index 7036a0d1..414ea35c 100644
--- a/data/dictionaries/gl/directionals.txt
+++ b/data/dictionaries/gl/directionals.txt
@@ -1,4 +1,8 @@
 leste|este|e
 norte|n
+nordeste|ne
+noroeste|no
 oeste|o
-sur|s
\ No newline at end of file
+sur|s
+sueste|se
+suroeste|so
\ No newline at end of file
diff --git a/data/dictionaries/gl/personal_titles.txt b/data/dictionaries/gl/personal_titles.txt
index 2e918f2e..ad212269 100644
--- a/data/dictionaries/gl/personal_titles.txt
+++ b/data/dictionaries/gl/personal_titles.txt
@@ -1,2 +1,2 @@
 san|s
-santa|sta
\ No newline at end of file
+santa|stª|sta|st.ª|st.a
\ No newline at end of file
diff --git a/data/dictionaries/gl/stopwords.txt b/data/dictionaries/gl/stopwords.txt
index 753694de..d46994a6 100644
--- a/data/dictionaries/gl/stopwords.txt
+++ b/data/dictionaries/gl/stopwords.txt
@@ -1,4 +1,5 @@
 a
+á
 al
 al lado
 as
@@ -13,7 +14,7 @@ dela
 deles
 delas
 detras
-e
+é
 en
 encima
 enfronte
@@ -28,6 +29,7 @@ nela
 neles
 nelas
 o
+ó
 os
 para
 y
diff --git a/data/dictionaries/gl/street_types.txt b/data/dictionaries/gl/street_types.txt
index daec29df..ae941065 100644
--- a/data/dictionaries/gl/street_types.txt
+++ b/data/dictionaries/gl/street_types.txt
@@ -1,23 +1,23 @@
-autovia
+autovía|autovia
 avenida|av|avd|avda
 alameda
 baixada
-camino
+camiño|camino
 costa
 encosta
 estrada
 glorieta
 paseo
 praza|pr|pza
-pracina
+praciña|pracina
 rambla|rbla
 rotunda
-rua|r
-ruas|rs
+rúa|rua|r
+rúas|ruas|rs
 ruela
 sendeiro
 suba
 subida|sbida
-travesia
-via
+travesía|travesia|trav
+vía|via
 viela
\ No newline at end of file
diff --git a/data/dictionaries/gl/unit_types.txt b/data/dictionaries/gl/unit_types.txt
new file mode 100644
index 00000000..3dad0087
--- /dev/null
+++ b/data/dictionaries/gl/unit_types.txt
@@ -0,0 +1,2 @@
+dereita
+esquerda
\ No newline at end of file
diff --git a/data/dictionaries/hi/street_types.txt b/data/dictionaries/hi/street_types.txt
new file mode 100644
index 00000000..fde3a96b
--- /dev/null
+++ b/data/dictionaries/hi/street_types.txt
@@ -0,0 +1,3 @@
+bazaar|bazar
+marg
+nagar
\ No newline at end of file
diff --git a/data/dictionaries/it/company_types.txt b/data/dictionaries/it/company_types.txt
index 507e38c9..2fc4ec18 100644
--- a/data/dictionaries/it/company_types.txt
+++ b/data/dictionaries/it/company_types.txt
@@ -5,12 +5,12 @@ cooperativo|coop.vo|coopvo
 gruppo di interesse economico|gruppo d'interesse economico|gruppo d' interesse economico|gie|g.i.e.|g.i.e|g i e
 ditta individuale
 football club|fc|f.c.|f.c|f c
-societa|sta
-societa cooperativa a responabilita limitata|scrl|s.c.r.l.|s.c.r.l|s c r l
-societa semplice|ss|s.s.|s.s|s s
-societa in accomandita semplice|sas|s.a.s.|s.a.s|s a s
-societa in nome collettivo|snc|s.n.c.|s.n.c|s n c
-societa per azioni|spa|s.p.a.|s.p.a|s p a
-societa in accomandita per azioni|sapa|s.a.p.a.|s.a.p.a|s a p a
-societa a garanzia limitata|sagl|s.a.g.l.|s.a.g.l|s a g l
-societa a responsabilita limitata|srl|s.r.l.|s.r.l|s r l
\ No newline at end of file
+società|societa|sta
+società cooperativa a responsabilità limitata|societa cooperativa a responsabilita limitata|scrl|s.c.r.l.|s.c.r.l|s c r l
+società semplice|societa semplice|ss|s.s.|s.s|s s
+società in accomandità semplice|societa in accomandita semplice|sas|s.a.s.|s.a.s|s a s
+società in nome collettivo|societa in nome collettivo|snc|s.n.c.|s.n.c|s n c
+società per azioni|societa per azioni|spa|s.p.a.|s.p.a|s p a
+società in accomandità per azioni|societa in accomandita per azioni|sapa|s.a.p.a.|s.a.p.a|s a p a
+società a garanzia limitata|societa a garanzia limitata|sagl|s.a.g.l.|s.a.g.l|s a g l
+società a responsabilità limitata|societa a responsabilita limitata|srl|s.r.l.|s.r.l|s r l
\ No newline at end of file
diff --git a/data/dictionaries/it/directionals.txt b/data/dictionaries/it/directionals.txt
index fcfc4694..cc728abe 100644
--- a/data/dictionaries/it/directionals.txt
+++ b/data/dictionaries/it/directionals.txt
@@ -1,3 +1,4 @@
+levante
 nord|n
 nord est|nordest|ne|n e
 nord ovest|nordovest|no|n o
diff --git a/data/dictionaries/it/personal_titles.txt b/data/dictionaries/it/personal_titles.txt
index 484f5faa..e896e724 100644
--- a/data/dictionaries/it/personal_titles.txt
+++ b/data/dictionaries/it/personal_titles.txt
@@ -54,6 +54,7 @@ reverendo|rev
 reverendo madre|rm|r.m.|r.m|r m
 reverendo padre|rp|r.p.|r.p|r p
 san|s
+sant'
 santa|s
 santo|s
 santo padre|sp|s.p.|s.p|s p
diff --git a/data/dictionaries/it/place_names.txt b/data/dictionaries/it/place_names.txt
index f9ae548c..17e30e53 100644
--- a/data/dictionaries/it/place_names.txt
+++ b/data/dictionaries/it/place_names.txt
@@ -154,4 +154,4 @@ tintoria
 torre
 trattoria
 ufficio
-universita|univ|uni|univers
\ No newline at end of file
+università|universita|univ|uni|univers
\ No newline at end of file
diff --git a/data/dictionaries/it/street_types.txt b/data/dictionaries/it/street_types.txt
index ecbc4c81..5a3dc7bf 100644
--- a/data/dictionaries/it/street_types.txt
+++ b/data/dictionaries/it/street_types.txt
@@ -24,7 +24,7 @@ gallerie|gall.e|galle
 genna|g.na|gna
 genne|g.ne|gne
 largo|l.go|lgo
-localita|loc|loc.ta|locta
+località|localita|loc|loc.ta|locta
 piazza|p.za|p.zza|pza|pzza
 piazzale|p.le|ple
 piazzetta|p.ta|pta
@@ -50,6 +50,6 @@ via|v
 via comunale|vc|v.c.|v.c|v c
 via provincale|vp|v.p.|v.p|v p|v provinciale
 via statale|vs|v.s.|v.s|v s
-viale|v.le|vle
+viale|v.le|vle|vl
 vicolo|v.lo|vlo
 vico
\ No newline at end of file
diff --git a/data/dictionaries/it/synonyms.txt b/data/dictionaries/it/synonyms.txt
index 23fdb970..5e1411f8 100644
--- a/data/dictionaries/it/synonyms.txt
+++ b/data/dictionaries/it/synonyms.txt
@@ -31,7 +31,7 @@ cozzi|c.zi|czi
 cozzo|c.zo|czo
 commerciale|comm.le|commle
 comunale|com.le|comle
-comunita|com.ta|comta
+comunità|comunita|com.ta|comta
 decembre|dec
 dicembre|dic
 distretto|distr.o|distro
diff --git a/data/dictionaries/it/unit_types.txt b/data/dictionaries/it/unit_types.txt
index 0048c50b..5fa8128b 100644
--- a/data/dictionaries/it/unit_types.txt
+++ b/data/dictionaries/it/unit_types.txt
@@ -1,13 +1,13 @@
 blocco|bl.o|blo|blo
 blocchi|bl.i|bli|bli
 cantina|c.tina|ctina
-casa|c
+casa|c|ca|ca'
 casetto|c.etto
 dipartimento|dipart.o|dpmto
 edificio|edif.o|edifo
 garage|g.ge|gge
 giardino|g.no|gno
-numero|no|n.o|n o|n
+numero|nº|no|n.º|n.o|n|#
 officina|off.a|off
 palazzo|pal.zo|palzo
-piano|p.o|p.no|pno
\ No newline at end of file
+piano|pº|p.º|p.o|p.nº|p.no|pnº|pno
\ No newline at end of file
diff --git a/data/dictionaries/ja/building_types.txt b/data/dictionaries/ja/building_types.txt
index 68346e6e..35947c59 100644
--- a/data/dictionaries/ja/building_types.txt
+++ b/data/dictionaries/ja/building_types.txt
@@ -3,5 +3,4 @@ ban
 番 地
 banchi
 番 地 の
-banchi no
-banchino
\ No newline at end of file
+banchi no|banchino
\ No newline at end of file
diff --git a/data/dictionaries/ja/directionals.txt b/data/dictionaries/ja/directionals.txt
index 21f4c485..4dab16a8 100644
--- a/data/dictionaries/ja/directionals.txt
+++ b/data/dictionaries/ja/directionals.txt
@@ -7,10 +7,10 @@ higashi
 西
 nishi
 北 東
-hokutou
+hokutō|hokuto|hokutou
 北 西
 hokusei
 南 東
-nantou
+nantō|nanto|nantou
 南 西
 nansei
\ No newline at end of file
diff --git a/data/dictionaries/ja/street_types.txt b/data/dictionaries/ja/street_types.txt
new file mode 100644
index 00000000..6519fee9
--- /dev/null
+++ b/data/dictionaries/ja/street_types.txt
@@ -0,0 +1,61 @@
+
+バイパス 道 路
+baipasu dōro|baipasu doro|baipasudōro|baipasudoro
+バイパス
+baipasu
+ブールバール
+būrubāru|burubaru
+道 路
+dōro|doro
+街 路
+gairo
+ハイ・ストリート
+hai·sutorīto|hai sutorīto|haisutorīto|hai·sutorito|hai sutorito|haisutorito
+自 動 車 道
+jidōshadō|jidoshado
+街 道
+kaidō|kaido
+環 状 道 路
+kanjō dōro|kanjo doro|kanjōdōro|kanjo doro
+経 路
+keiro
+公 道
+kōdō|kodo
+公 園 道 路
+kōen dōro|koen doro|kōendōro|koendoro
+国 道
+kokudō|kokudo
+高 速 道 路
+kōzokudōro|kozokudoro|kozoku doro|kōzoku dōro|kosukudoro|kosoku doro
+クルドサック
+kurudosakku
+道
+michi
+表 通 り
+omotedōri|omotedori
+大 通 り
+ōdōri|odori
+メーンストリート
+mēnsutorīto|mensutorito
+メロディーロード
+merodīrōdo|merodirodo
+路 地
+roji
+ローマ 街 道
+rōma kaidō|roma kaido|rōmakaidō|romakaido
+私 道
+shidō|shido
+州 間 高 速 道 路
+shūkankōsokudōro|shukankosokudoro
+ストリート
+sutorīto|sutorito
+通 り
+tōri|tori
+通 り 道
+tōrimichi|torimichi
+都 市 高 速 道 路
+toshi kōzokudōro|toshi kozokudoro|toshikōzokudōro|toshikozokudoro
+通 路
+tsūro|tsuro
+有 料 道 路
+yūryō dōro|yuryo doro|yūryōdōro|yuryodoro
\ No newline at end of file
diff --git a/data/dictionaries/ko/directionals.txt b/data/dictionaries/ko/directionals.txt
index bc988412..b38067fb 100644
--- a/data/dictionaries/ko/directionals.txt
+++ b/data/dictionaries/ko/directionals.txt
@@ -1,20 +1,31 @@
 북
 book
+bug
 남
 nahm
+nam
 동
 dohng
+dong
 서
 seo
 북 동
 book dohng
 bookdohng
+bug dong
+bugdong
 북 서
 book seo
 bookseo
+bug seo
+bugseo
 남 동
 nahm dohng
 nahndohng
+nam dong
+namdong
 남 서
 nahm seo
-nahmseo
\ No newline at end of file
+nahmseo
+nam seo
+namseo
\ No newline at end of file
diff --git a/data/dictionaries/ko/street_types.txt b/data/dictionaries/ko/street_types.txt
index d7e6583f..c714f26e 100644
--- a/data/dictionaries/ko/street_types.txt
+++ b/data/dictionaries/ko/street_types.txt
@@ -1,9 +1,8 @@
 로
 ro
+lo
 no
 길
 gil
-로
-lo
 가
 ga
\ No newline at end of file
diff --git a/data/dictionaries/nl/concatenated_suffixes_separable.txt b/data/dictionaries/nl/concatenated_suffixes_separable.txt
index fdd6691a..e6d60e38 100644
--- a/data/dictionaries/nl/concatenated_suffixes_separable.txt
+++ b/data/dictionaries/nl/concatenated_suffixes_separable.txt
@@ -1,12 +1,12 @@
-gracht|gr
+gracht|gr.
 hof|h.
-laan|ln
+laan|ln.
 lange|l.
 lang|l.
-plain|pln
-singel|sngl
-straat|str
-steenweg|stwg
-verlengde|verl
-vliet|vlt
-weg|wg
\ No newline at end of file
+plain|pln.
+singel|sngl.
+straat|str.
+steenweg|stwg.
+verlengde|verl.
+vliet|vlt.
+weg|wg.
\ No newline at end of file
diff --git a/data/dictionaries/pt/building_types.txt b/data/dictionaries/pt/building_types.txt
index c0b552d1..7d7c523a 100644
--- a/data/dictionaries/pt/building_types.txt
+++ b/data/dictionaries/pt/building_types.txt
@@ -1,4 +1,4 @@
 bloco|bl
-edificio|edf|edif
+edifício|edificio|edf|edif
 torre|tr
 vivenda|vv
\ No newline at end of file
diff --git a/data/dictionaries/pt/company_types.txt b/data/dictionaries/pt/company_types.txt
index 3d2b048f..310b43b3 100644
--- a/data/dictionaries/pt/company_types.txt
+++ b/data/dictionaries/pt/company_types.txt
@@ -1,23 +1,23 @@
 agrupamento complementar de empresas|ace|a.c.e.|a.c.e|a c e
-associacao desportiva|ad|a.d.|a.d|a d
-associacao em sentido estrito
+associação desportiva|associacao desportiva|ad|a.d.|a.d|a d
+associação em sentido estrito|associacao em sentido estrito
 clube desportivo|cd|c.d.|c.d|c d
 companhia|cia|comp
 companhia anonima|ca|c.a.|c.a|c a
 companhia de responsabilidao limitada|crl|c.r.l.|c.r.l|c r l
 empresa individual|ei|e i|e.i.|e.i|firma individual
 empresa individual de responsabilidade limitada|eireli|e.i.r.e.l.i.|e.i.r.e.l.i|e i r e l i
-empresa publica|ep|e.p.|e.p|e p
-fundacao privada
-fundacao publica
+empresa pública|empresa publica|ep|e.p.|e.p|e p
+fundação privada|fundacao privada
+fundação pública|fundacao publica
 futebol clube|fc|f.c.|f.c|f c
 limitada|ltda|lt.da|lda|l.da|
-organizacao nao governamental|ong|o.n.g.|o.n.g|o n g
-organizacao da sociedade civil de interesse publico|oscip|o.s.c.i.p.|o.s.c.i.p|o s c i p
+organização nao governamental|organizacao nao governamental|ong|o.n.g.|o.n.g|o n g
+organização da sociedade civil de interesse público|organizacao da sociedade civil de interesse publico|oscip|o.s.c.i.p.|o.s.c.i.p|o s c i p
 sociedade aberta|sa|s.a.|s.a|s a
-sociedade anonima|sa|s.a.|s.a|s a|s / a
-sociedade anonima de responsabilidade limitada|sarl|s.a.r.l.|s.a.r.l|s a r l
-sociedade anonima desportiva|sad|s.a.d.|s.a.d|s a d
+sociedade anónima|sociedade anonima|sa|s.a.|s.a|s a|s / a
+sociedade anónima de responsabilidade limitada|sociedade anonima de responsabilidade limitada|sarl|s.a.r.l.|s.a.r.l|s a r l
+sociedade anónima desportiva|sociedade anonima desportiva|sad|s.a.d.|s.a.d|s a d
 sociedade em nome coletivo|snc|s.n.c.|s.n.c|s n c
 sociedade em conta de participacao|scp|s.c.p.|s.c.p|s c p
 sociedade em comandita simples|scs|s.c.s.|s.c.s|s c s
diff --git a/data/dictionaries/pt/no_number.txt b/data/dictionaries/pt/no_number.txt
index 1e856294..8ec43d83 100644
--- a/data/dictionaries/pt/no_number.txt
+++ b/data/dictionaries/pt/no_number.txt
@@ -1 +1 @@
-sem numero|sn|s.n.|s.n|s / n|s n
\ No newline at end of file
+sem número|sem numero|sn|s.n.|s.n|s / n|s n
\ No newline at end of file
diff --git a/data/dictionaries/pt/personal_suffixes.txt b/data/dictionaries/pt/personal_suffixes.txt
index c0c1480a..d4b06821 100644
--- a/data/dictionaries/pt/personal_suffixes.txt
+++ b/data/dictionaries/pt/personal_suffixes.txt
@@ -1,3 +1,3 @@
 filho|f.o
-junior|jr
+júnior|junior|jr
 neto
\ No newline at end of file
diff --git a/data/dictionaries/pt/personal_titles.txt b/data/dictionaries/pt/personal_titles.txt
index 4c2bf2d2..19910fa6 100644
--- a/data/dictionaries/pt/personal_titles.txt
+++ b/data/dictionaries/pt/personal_titles.txt
@@ -7,11 +7,11 @@ baronesa
 bispo|bpo|b.po
 brigadeiro|brg|brig
 cacique|cac
-capitao|cap|capt
-capitao de corveta|cap corv
-capitao de fragata|cap frag
-capitao de mar e guerra|cap m g|cap mg
-capitao tenente|cap ten|cap tte
+capitão|capitao|cap|capt
+capitão de corveta|capitao de corveta|cap corv
+capitão de fragata|capitao de fragata|cap frag
+capitão de mar e guerra|capitao de mar e guerra|cap m g|cap mg
+capitão tenente|capitao tenente|cap ten|cap tte
 cardeal|card
 comandante|cmdt
 comendador|comend|cmdr|comor|com.or
@@ -26,60 +26,60 @@ desembargadora|desa|des.a
 diacono|diac
 diacona|diaca
 dom|d
-dona|da|d.a
+dona|dª|da|d.ª|d.a
 doutor|dr
-doutora|dra|d.ra
+doutora|drª|dra|d.rª|d.ra
 duque|dq
 duquesa|dqsa|dqa
 embaixador|emb
 eminencia|ema|em.a
 eminentissimo|emmo|em.mo
-enfermeira|enfa|enf.a
-enfermeiro|enfo|enf
-engenheira|enga
-engenheiro|eng|engo
-excelencia|exa|ex.a
-excelentissima|exma|ex.ma
-excelentissimo|exmo|ex.mo
+enfermeira|enfª|enfa|enf.ª|enf.a
+enfermeiro|enfº|enfo|enf|enf.º|enf.o
+engenheira|engª|enga|eng.ª|eng.a
+engenheiro|engº|eng.º|eng|engo|eng.o
+excelencia|exª|exa|ex.ª|ex.a
+excelentissima|exmª|exma|ex.mª|ex.ma
+excelentissimo|exmº|exmo|ex.mº|ex.mo
 frei|fr
 general|gen|gal|g.al
 governador|gov|govdor|govd.or|gov.dor
-ilustrissima|ilma|il.ma
-ilustrissimo|ilmo|il.mo
+ilustrissima|ilmª|ilma|il.mª|il.ma
+ilustrissimo|ilmº|ilmo|il.mº|il.mo
 infante|inf
-irma|ima|im
-irmao|imo|im
+irmã|irma|imª|ima|im
+irmão|irmao|imº|imo|im
 juiz|jz
 maestra|mta|mtra|mstra
 maestro|mto|mtro|mstro
 major|maj
 major brigadeiro|maj brig
 marechal|mar|mal|m.al
-marques|mq|marq
+marquês|marques|mq|marq
 marquesa|mqsa|marqa
-madre|me
+madre|me|m.e
 medico|med
-mestra|ma|m.a
+mestra|mª|ma|m.ª|m.a
 mestre|me|m.e
-ministerio|min
+ministério|ministerio|min
 monsenhor|mons
-nossa senhora|nsa|ns a|n sa|n.s.a.|n.s.a
+nossa senhora|nsa|nª sª|nªsª|n srª|nª srª|n sa|n sra|n.s.a.|n.s.a
 nosso senhor|ns|n.s.|n.s|n s
 padre|pe|p.e
 pastor|pr
 prefeito|pref
 presidente|presid|pres
-professor|prof
-professora|profa
+professor|prof|profº
+professora|profa|prof.a|profª|prof.ª
 professoras|profas
 professores|profs
 reverenda|revda|rev.da
 reverendo|revdo|rev.do
 reverendissima|revma|rev.ma
 reverendissimo|revmo|rev.mo
-santa|sta
-santo|st|sto
-sao|s
+santa|stª|sta|st.ª|st.a
+santo|stº|sto|st|st.º|st.o
+são|sao|s
 sargento|sarg|sgto|sargto
 sargento ajudante|sarg ajte|sarg aj.te
 secretaria|sec.a|secr.a|secra
@@ -87,7 +87,7 @@ secretario|sec|secr
 senador|sen
 senhor|s|sr|s.r
 senhores|srs|s.rs
-senhora|sa|sra|sr.a|s.ra
+senhora|sª|sa|srª|sra|sr.ª|sr.a|s.ra|s.rª
 senhoras|sras|s.ras
 senhorita|srta|sr.ta
 senhoritas|srtas|sr.tas
diff --git a/data/dictionaries/pt/place_names.txt b/data/dictionaries/pt/place_names.txt
index 8b23e48f..654ddbb6 100644
--- a/data/dictionaries/pt/place_names.txt
+++ b/data/dictionaries/pt/place_names.txt
@@ -2,14 +2,14 @@ academia|acad
 associacao|ass
 arquitecto|arq|arqo|arq.o
 bairro|b|bo|br|b.o
-bombeiros voluntarios|bv|b v
+bombeiros voluntários|bombeiros voluntarios|bv|b v
 camara municipal|cm|c.m.|c.m|c m
 casal|csl
 castelo|cast
 centro comercial|cc|c.c.|c.c|c c
-ciclo do ensino basico|ceb|c.e.b.|c.e.b|c e b
-escola basica|eb|e.b.|e.b|e b
-estacao de tratamento de aguas residuais|etar|e.t.a.r.|e.t.a.r|e t a r
+ciclo do ensino básico|ciclo do ensino basico|ceb|c.e.b.|c.e.b|c e b
+escola básica|escola basica|eb|e.b.|e.b|e b
+estação de tratamento de águas residuais|estacao de tratamento de aguas residuais|etar|e.t.a.r.|e.t.a.r|e t a r
 fonte|f.te|fte
 galeria|gal
 guarda nacional republicana|gnr|g.n.r.|g.n.r|g n r
@@ -17,9 +17,9 @@ instituto|inst
 loja
 lojas
 parque|pq|prq|parq
-pavilhao|pav
-policia de seguranca publica|psp|p.s.p.|p.s.p|p s p
-policia judiciaria|pj|p.j.|p.j|p j
+pavilhão|pailhao|pav
+polícia de segurança pública|policia de seguranca publica|psp|p.s.p.|p.s.p|p s p
+polícia judiciária|policia judiciaria|pj|p.j.|p.j|p j
 ponte|pont|pte|p.te|pnte
 porto|pto|p.to
 rodoviaria|rdv
diff --git a/data/dictionaries/pt/qualifiers.txt b/data/dictionaries/pt/qualifiers.txt
index 449cec07..3373e002 100644
--- a/data/dictionaries/pt/qualifiers.txt
+++ b/data/dictionaries/pt/qualifiers.txt
@@ -1,7 +1,8 @@
-bairro|b|bo|br
+bairro|b|bº|bo|brº|bro
 distrito|dtto|dist
 divisao|div
 quadra|q|qd
 secao|sec
 superquadra|super quadra|sq|s.q.|s.q|s q
+urbanização|urbanizacao|urb
 zona|zn
\ No newline at end of file
diff --git a/data/dictionaries/pt/stopwords.txt b/data/dictionaries/pt/stopwords.txt
index cb8d0565..7e0d5fe8 100644
--- a/data/dictionaries/pt/stopwords.txt
+++ b/data/dictionaries/pt/stopwords.txt
@@ -1,9 +1,10 @@
+á
 a
 ao
 aos
-as
-ate
-atras
+ás|as
+até|ate
+atrás|atras
 com
 da
 das
@@ -22,7 +23,7 @@ na
 nas
 no
 nos
-nossa|n|na|n.a
+nossa|nª|na|n.ª|n.a
 nosso|n
 o
 os
diff --git a/data/dictionaries/pt/street_types.txt b/data/dictionaries/pt/street_types.txt
index 1b0c6257..841e61fe 100644
--- a/data/dictionaries/pt/street_types.txt
+++ b/data/dictionaries/pt/street_types.txt
@@ -4,10 +4,11 @@ autoestrada|auto estrada|auto estr|autoestr
 avenida|av|ava|ave
 avenida marginal|ave marg|av marg|ava marg 
 azinhaga|az
-bairro|b|bo|br
+bairro|b|bº|bo|brº|bro
 beco|bc|bco
-calcada|cc
-caclcadinha|ccnh
+calçada|calcada|cc
+calçadinha|caclcadinha|ccnh
+câmara municipal|camara municipal|cm|c.m.|c. m.
 caminho|cam|camno
 direito|dto
 esquerdo|esq
@@ -18,15 +19,15 @@ estrada nacional|en|e n|estr n
 estrada regional|er|e r|estr r
 frei|fr
 frente|ft
-itinerario complementar|ic|i c
-itinerario principal|ip|i p
+itinerário complementar|itinerario complementar|ic|i c
+itinerário principal|itinerario principal|ip|i p
 largo|lg|l
 lugar|lg|lug
 parada|pda
 particular|part
 ponto|pto|pnto
-praca|pc|pr|pca
-praceta|pct|pcta
+praça|praca|pç|pc|pr|pça|pca
+praceta|pct|pctª|pcta
 projectada|proj
 prolongamento|prolng
 quinta|qu|qta
diff --git a/data/dictionaries/pt/unit_types.txt b/data/dictionaries/pt/unit_types.txt
index ba3dc3f2..71174373 100644
--- a/data/dictionaries/pt/unit_types.txt
+++ b/data/dictionaries/pt/unit_types.txt
@@ -10,17 +10,17 @@ escadas|esc
 escadinhas|escnh
 esquerdo|esq
 frente|ft
-habitacao|hab
+habitação|habitacao|hab
 jardim|jrd|jard|jd
 loja|lj
 lojas|ljs
 lote|lt
-numero|no|n|nro|nmro|nro
+número|numero|no|nº|n|nrº|nro|nmro|nmrº
 loteamento|loteam
-patio|pto
+pátio|patio|pto
 quarta
 quarto|qt|qto
-res do chao|resdochao|r / c|rc|r c
+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
diff --git a/data/dictionaries/zh/directionals.txt b/data/dictionaries/zh/directionals.txt
index 6cb6b417..ecb184e2 100644
--- a/data/dictionaries/zh/directionals.txt
+++ b/data/dictionaries/zh/directionals.txt
@@ -1,20 +1,20 @@
 北
-bei
+běi|bei
 东
-dong
+dōng|dong
 南
-nan
+nán|nan
 西
-xi
+xī|xi
 西 北
-xibei
-xi bei
+xīběi|xibei
+xī běi|xi bei
 西 南
-xinan
-xi nan
+xīnán|xinan
+xī nán|xi nan
 东 北
-dongbei
-dong bei
+dōngběi|dongbei
+dōng běi|dong bei
 东 南
-dongnan
-dong nan
\ No newline at end of file
+dōngnán|dongnan
+dōng nán|dong nan
\ No newline at end of file
diff --git a/data/dictionaries/zh/level_types.txt b/data/dictionaries/zh/level_types.txt
index 15724a01..655a8a7f 100644
--- a/data/dictionaries/zh/level_types.txt
+++ b/data/dictionaries/zh/level_types.txt
@@ -1,2 +1,2 @@
 樓
-lou
\ No newline at end of file
+lóu|lou
\ No newline at end of file
diff --git a/data/dictionaries/zh/place_names.txt b/data/dictionaries/zh/place_names.txt
index 49909955..a84e6896 100644
--- a/data/dictionaries/zh/place_names.txt
+++ b/data/dictionaries/zh/place_names.txt
@@ -1,2 +1,2 @@
 桥
-qiao
\ No newline at end of file
+qiáo|qiao
\ No newline at end of file
diff --git a/data/dictionaries/zh/qualifiers.txt b/data/dictionaries/zh/qualifiers.txt
index 6a8cb213..060d9494 100644
--- a/data/dictionaries/zh/qualifiers.txt
+++ b/data/dictionaries/zh/qualifiers.txt
@@ -1,21 +1,21 @@
 省
-sheng
+shěng|sheng
 縣
-xian
+xiàn|xian
 市
-shi
+shì|shi
 區
 区
-qu
+qū|qu
 鎮
-zhen
+zhèn|zhen
 鄉
-xiang
+xiāng|xiang
 里
-li
+lǐ|li
 村
-cun
+cūn|cun
 鄰
-lin
+lín|lin
 邮 编
-youbian
\ No newline at end of file
+yóubiān|youbian
\ No newline at end of file
diff --git a/data/dictionaries/zh/stopwords.txt b/data/dictionaries/zh/stopwords.txt
index 5201da96..9b5b5231 100644
--- a/data/dictionaries/zh/stopwords.txt
+++ b/data/dictionaries/zh/stopwords.txt
@@ -1 +1,2 @@
-号
\ No newline at end of file
+号
+hào
\ No newline at end of file
diff --git a/data/dictionaries/zh/street_types.txt b/data/dictionaries/zh/street_types.txt
index 7293628d..261a2eb3 100644
--- a/data/dictionaries/zh/street_types.txt
+++ b/data/dictionaries/zh/street_types.txt
@@ -1,30 +1,30 @@
 村 道
-cundao
+cūn dào|cun dao|cūndào|cundao
 大 道
-dadao
+dàdào|dadao
 大 街
-dajie
+dàjiē|dajie
 道
-dao
+dào|dao
 大 院
-dayuan
+dà yuàn|dayuan
 国 道
-guodao
+guódào|guodao
 胡 同
-hutong
+hútòng|hutong
 街
-jie
+jiē|jie
 路
-lu
+lù|lu
 省 道
-shengdao
+shěng dào|sheng dao|shěngdào|shengdao
 县 道
-xiandao
+xiàn dào|xian dao|xiàndào|xiandao
 巷
-xiang
+xiàng|xiang
 乡 道
-xiangdao
+xiāng dào|xiang dao|xiāngdào|xiangdao
 段
-duan
+duàn|duan
 弄
-long
\ No newline at end of file
+nòng|nong
\ No newline at end of file
diff --git a/data/dictionaries/zh/unit_types.txt b/data/dictionaries/zh/unit_types.txt
index 45d193ce..13fc8d5b 100644
--- a/data/dictionaries/zh/unit_types.txt
+++ b/data/dictionaries/zh/unit_types.txt
@@ -1,8 +1,8 @@
 號
-hao
+hào|hao
 之
-zhi
+zhī|zhi
 室
-shi
+shì|shi
 斋
-zhai
\ No newline at end of file
+zhāi|zhai
\ No newline at end of file