diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index c16ab796d1..7e687e0c87 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -151,7 +151,7 @@
 	<string name="poi_subway_station">Станцыя мэтро</string>
 	<string name="poi_taxi">Стаянка таксі</string>
 
-	<string name="poi_airport">Аэрапорт</string>
+	<string name="poi_aerodrome">Аэрапорт</string>
 	<string name="poi_helipad">Шрубалётная пляцоўка</string>
 	<string name="poi_runway">Узлётная паласа</string>
 	<string name="poi_aeroway_terminal">Тэрмінал аэрапорту</string>
@@ -192,7 +192,7 @@
 	<string name="poi_waterway_turning_point">Паваротная кропка на вадзе</string>
 	<string name="poi_weir">Невялікая плаціна</string>
 	<string name="poi_dam">Дамба</string>
-	<string name="poi_water_mill">Вадзяны млын</string>
+	<string name="poi_watermill">Вадзяны млын</string>
 
 	<string name="poi_power_substation">Падстанцыя</string>
 	<string name="poi_power_transformer">Трансфарматар</string>
@@ -285,7 +285,7 @@
 	<string name="poi_lawyer">Юрыдычныя паслугі</string>
 	<string name="poi_office_telecommunication">Тэлекамунікацыйная кампанія</string>
 	<string name="poi_ngo">Грамадзкая арганізацыя</string>
-	<string name="poi_town_hall">Адміністрацыя населенага пункта</string>
+	<string name="poi_townhall">Адміністрацыя населенага пункта</string>
 	<string name="poi_employment_agency">Біржа працы</string>
 	<string name="poi_research">Дасьледчы цэнтар</string>
 	<string name="poi_it">Інфармацыйныя тэхналёгіі</string>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 16eb0a9419..f459b8a7e2 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -127,7 +127,7 @@
 	<string name="poi_subway_station">Estació de metro</string>
 	<string name="poi_taxi">Parada de taxis</string>
 
-	<string name="poi_airport">Aeroport</string>
+	<string name="poi_aerodrome">Aeroport</string>
 	<string name="poi_helipad">Heliport</string>
 	<string name="poi_runway">Pista d\'aterratge</string>
 	<string name="poi_aeroway_terminal">Terminal d\'aeroport</string>
@@ -163,7 +163,7 @@
 	<string name="poi_lock_gate">Resclosa</string>
 	<string name="poi_weir">Sobreeixidor</string>
 	<string name="poi_dam">Presa d\'aigua</string>
-	<string name="poi_water_mill">Molí hidràulic</string>
+	<string name="poi_watermill">Molí hidràulic</string>
 
 	<string name="poi_power_substation">Subestació elèctrica</string>
 	<string name="poi_power_transformer">Transformador elèctric</string>
@@ -249,7 +249,7 @@
 	<string name="poi_lawyer">Gabinet d\'advocats</string>
 	<string name="poi_office_telecommunication">Empresa de telecomunicacions</string>
 	<string name="poi_ngo">ONG</string>
-	<string name="poi_town_hall">Ajuntament</string>
+	<string name="poi_townhall">Ajuntament</string>
 	<string name="poi_employment_agency">Oficina d\'ocupació</string>
 	<string name="poi_research">Oficina de recerca i desenvolupament</string>
 	<string name="poi_it">Consultoria en TIC</string>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index d474a7e268..e3dcd8aa53 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -61,7 +61,7 @@
 	<string name="poi_bus_stop">Zastávka autobusu</string>
 	<string name="poi_public_transport_platform_tram">Tramvajová zastávka</string>
 	<string name="poi_public_transport_station">Zastávka veřejné dopravy</string>
-	<string name="poi_airport">Letiště</string>
+	<string name="poi_aerodrome">Letiště</string>
 	<string name="poi_lighthouse">Maják</string>
 
 	<string name="poi_bicycle_rental">Půjčovna kol</string>
@@ -393,7 +393,7 @@
 	<string name="poi_waterway_turning_point">Vodní obratiště</string>
 	<string name="poi_weir">Hráz</string>
 	<string name="poi_dam">Přehrada</string>
-	<string name="poi_water_mill">Vodní mlýn</string>
+	<string name="poi_watermill">Vodní mlýn</string>
 
 	<string name="poi_power_substation">Transformátorová stanice</string>
 	<string name="poi_power_transformer">Transformátor</string>
@@ -482,7 +482,7 @@
 	<string name="poi_estate_agent">Realitní kancelář</string>
 	<string name="poi_office_telecommunication">Telekomunikace</string>
 	<string name="poi_ngo">Nezisková organizace</string>
-	<string name="poi_town_hall">Radnice</string>
+	<string name="poi_townhall">Radnice</string>
 	<string name="poi_employment_agency">Úřad práce</string>
 	<string name="poi_research">Výzkumný ústav</string>
 	<string name="poi_it">Informační technologie</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 692d210593..170f987ee2 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -146,7 +146,7 @@
         <string name="poi_subway_station">Metrostation</string>
         <string name="poi_taxi">Taxaholdeplads</string>
 
-        <string name="poi_airport">Lufthavn</string>
+        <string name="poi_aerodrome">Lufthavn</string>
         <string name="poi_helipad">Helikopterlandingsplads</string>
         <string name="poi_runway">Landingsbane</string>
         <string name="poi_aeroway_terminal">Lufthavnsterminal</string>
@@ -188,7 +188,7 @@
         <string name="poi_waterway_turning_point">Vendepunkt på vandet</string>
         <string name="poi_weir">Stemmeværk</string>
         <string name="poi_dam">Dæmning</string>
-        <string name="poi_water_mill">Vandmølle</string>
+        <string name="poi_watermill">Vandmølle</string>
 
         <string name="poi_power_substation">Transformerstation</string>
         <string name="poi_power_transformer">Transformator</string>
@@ -257,7 +257,7 @@
         <string name="poi_lawyer">Advokat</string>
         <string name="poi_office_telecommunication">Telekommunikation selskab</string>
         <string name="poi_ngo">NGO</string>
-        <string name="poi_town_hall">Rådhus</string>
+        <string name="poi_townhall">Rådhus</string>
         <string name="poi_employment_agency">Arbejdsformidling</string>
         <string name="poi_research">Forskning</string>
         <string name="poi_it">IT kontor</string>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 15c10b5fca..125a4d22a8 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -21,7 +21,7 @@
 	<string name="poi_aeroway_gate">Flughafengate</string>
 	<string name="poi_aeroway_terminal">Flughafenterminal</string>
 	<string name="poi_craft_agricultural_engines">Landmaschinen</string>
-	<string name="poi_airport">Flughafen</string>
+	<string name="poi_aerodrome">Flughafen</string>
 	<string name="poi_alcohol">Spirituosenladen</string>
 	<string name="poi_alpine_hut">Berghütte</string>
 	<string name="poi_ambulance_station">Rettungswache</string>
@@ -538,7 +538,7 @@
 	<string name="poi_toll_booth">Mautstelle</string>
 	<string name="poi_information">Fremdenverkehrsamt</string>
 	<string name="poi_town">Kleinstadt</string>
-	<string name="poi_town_hall">Rathaus</string>
+	<string name="poi_townhall">Rathaus</string>
 	<string name="poi_toys">Spielwarenhandlung</string>
 	<string name="poi_trade">Geschäftszentrum</string>
 	<string name="poi_traffic_calming_bump">Bodenwelle</string>
@@ -571,7 +571,7 @@
 	<string name="poi_waste_disposal">Deponie</string>
 	<string name="poi_wastewater_plant">Abwasseranlage</string>
 	<string name="poi_craft_watchmaker">Uhrmacher</string>
-	<string name="poi_water_mill">Wassermühle</string>
+	<string name="poi_watermill">Wassermühle</string>
 	<string name="poi_water_park">Wasserpark</string>
 	<string name="poi_water_tower">Wasserturm</string>
 	<string name="poi_water_well">Wasserbrunnen</string>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 2b49376e5f..1814900ec4 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -145,7 +145,7 @@
 	<string name="poi_halt">Parada de tren</string>
 	<string name="poi_railway_subway_entrance">Entrada de metro</string>
 	<string name="poi_subway_station">Estación de metro</string>
-	<string name="poi_airport">Aeropuerto</string>
+	<string name="poi_aerodrome">Aeropuerto</string>
 	<string name="poi_helipad">Helipuerto</string>
 	<string name="poi_taxi">Parada de taxi</string>
 
@@ -229,7 +229,7 @@
 	<string name="poi_company">Empresa</string>
 	<string name="poi_estate_agent">Inmobiliaria</string>
 	<string name="poi_lawyer">Abogado</string>
-	<string name="poi_town_hall">Municipio</string>
+	<string name="poi_townhall">Municipio</string>
 	<string name="poi_employment_agency">Oficina de empleo</string>
 	<string name="poi_studio">Estudio</string>
 	<string name="poi_stadium">Estadio</string>
@@ -471,7 +471,7 @@
 	<string name="poi_waterway_turning_point">Punto de giro fluvial</string>
 	<string name="poi_weir">Aliviadero</string>
 	<string name="poi_dam">Presa</string>
-	<string name="poi_water_mill">Molino de agua</string>
+	<string name="poi_watermill">Molino de agua</string>
 
 	<string name="poi_telephone_exchange">Central telefónica</string>
 
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index 9178550783..684cafbb26 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -151,7 +151,7 @@
 <string name="poi_subway_station">ایستگاه مترو</string>
 <string name="poi_taxi">ایستگاه تاکسی</string>
 
-<string name="poi_airport">فرودگاه</string>
+<string name="poi_aerodrome">فرودگاه</string>
 <string name="poi_helipad">جایگاه هلیکوپتر</string>
 <string name="poi_runway">باند فرودگاه</string>
 <string name="poi_aeroway_terminal">ترمینال Aeroway</string>
@@ -194,7 +194,7 @@
 <string name="poi_waterway_turning_point">نقطه گردش آب</string>
 <string name="poi_weir">خاکریز</string>
 <string name="poi_dam">سد</string>
-<string name="poi_water_mill">اسیاب</string>
+<string name="poi_watermill">اسیاب</string>
 
 <string name="poi_power_substation">ایستگاه فرعی</string>
 <string name="poi_power_transformer">ترانسفورماتور</string>
@@ -289,7 +289,7 @@
 <string name="poi_lawyer">دفتر وکالت</string>
 <string name="poi_office_telecommunication">دفتر مخابراتی</string>
 <string name="poi_ngo">NGO</string>
-<string name="poi_town_hall">شهرداری</string>
+<string name="poi_townhall">شهرداری</string>
 <string name="poi_employment_agency">کاریابی</string>
 <string name="poi_research">مرکز تحقیقاتی</string>
 <string name="poi_it">دفتر فناوری اطلاعات</string>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 57cf923415..aa39d8156f 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -12,7 +12,7 @@
 	<string name="poi_aerialway_station">Station de transport aérien par câble</string>
 	<string name="poi_aeroway_gate">Porte d\'embarquement</string>
 	<string name="poi_runway">Aérodrome : piste</string>
-	<string name="poi_airport">Aérodrome</string> 
+	<string name="poi_aerodrome">Aérodrome</string> 
 	<string name="poi_alcohol">Magasin de boissons alcoolisées</string>
 	<string name="poi_alpine_hut">Refuge</string>
 	<string name="poi_ambulance_station">Station d\'ambulances</string>
@@ -372,7 +372,7 @@
 	<string name="poi_water_well">Puits</string>
 	<string name="poi_water_works">Usine d\'eau potable</string>
 	<string name="poi_waterfall">Chute d\'eau</string>
-	<string name="poi_water_mill">Moulin à eau</string>
+	<string name="poi_watermill">Moulin à eau</string>
 	<string name="poi_wayside_cross">Calvaire</string>
 	<string name="poi_wayside_shrine">Oratoire</string>
 	<string name="poi_wetland">Zone humide</string>
@@ -420,7 +420,7 @@
 	<string name="poi_podiatrist">Podologue</string>
 	<string name="poi_psychotherapist">Psychothérapeute</string>
 	<string name="poi_company">Entreprise</string>
-	<string name="poi_town_hall">Mairie</string>
+	<string name="poi_townhall">Mairie</string>
 	<string name="poi_educational_institution">Institution éducative</string>
 	<string name="poi_bicycle_track">Piste cycable</string>
 	<string name="poi_australian_football">Football autralien</string>
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index bd5ff183f6..960959bd3a 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -82,7 +82,7 @@
 	<string name="poi_subway_station">Estación de metro</string>
 	<string name="poi_taxi">Parada de taxis</string>
 
-	<string name="poi_airport">Aeroporto</string>
+	<string name="poi_aerodrome">Aeroporto</string>
 	<string name="poi_helipad">Heliporto</string>
 	<string name="poi_lighthouse">Faro</string>
 
@@ -100,7 +100,7 @@
 	<string name="poi_wastewater_plant">Estación depuradora de augas residuais</string>
 	<string name="poi_water_tower">Depósito de auga</string>
 	<string name="poi_dam">Encoro</string>
-	<string name="poi_water_mill">Aceña</string>
+	<string name="poi_watermill">Aceña</string>
 
 	<string name="poi_power_substation">Subestación</string>
 	<string name="poi_power_transformer">Transformador</string>
@@ -167,7 +167,7 @@
 	<string name="poi_lawyer">Avogado</string>
 	<string name="poi_office_telecommunication">Oficina de telecomunicacións</string>
 	<string name="poi_ngo">ONG</string>
-	<string name="poi_town_hall">Casa do Concello</string>
+	<string name="poi_townhall">Casa do Concello</string>
 	<string name="poi_employment_agency">Oficina de emprego</string>
 	<string name="poi_research">Oficina de investigación</string>
 	<string name="poi_advertising_agency">Axencia de publicidade</string>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index eda39c08ff..349e93949b 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -71,7 +71,7 @@
 	<string name="poi_subway_station">Metrómegálló</string>
 	<string name="poi_taxi">Taxidroszt</string>
 
-	<string name="poi_airport">Repülőtér</string>
+	<string name="poi_aerodrome">Repülőtér</string>
 	<string name="poi_runway">Kifutópálya</string>
 	<string name="poi_aeroway_terminal">Utasterminál</string>
 	<string name="poi_aeroway_gate">Reptér kapu</string>
@@ -122,7 +122,7 @@
 	<string name="poi_dentist">Fogorvos</string>
 	<string name="poi_veterinary">Állatorvos</string>
 	<string name="poi_sanatorium">Szanatórium</string>
-	<string name="poi_town_hall">Városháza</string>
+	<string name="poi_townhall">Városháza</string>
 	<string name="poi_stadium">Stadion</string>
 	<string name="poi_sports_centre">Sportközpont</string>
 	<string name="poi_golf_course">Golfpálya</string>
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index 0c452dec7f..2186d9063b 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -73,7 +73,7 @@
 	<string name="poi_bus_station">Stazione bus (obsoleto)</string>
 	<string name="poi_railway_subway_entrance">Entrata metropolitana</string>
 	<string name="poi_subway_station">Stazione metropolitana</string>
-	<string name="poi_airport">Aeroporto</string>
+	<string name="poi_aerodrome">Aeroporto</string>
 	<string name="poi_helipad">Eliporto</string>
 	<string name="poi_bicycle_rental">Noleggio bici</string>
 	<string name="poi_bicycle_parking">Parcheggio bici</string>
@@ -135,7 +135,7 @@
 	<string name="poi_speed_camera">Autovelox</string>
 	<string name="poi_turning_circle">Rotonda per inversione di marcia</string>
 	<string name="poi_wastewater_plant">Depuratore acque</string>
-	<string name="poi_water_mill">Mulino ad acqua</string>
+	<string name="poi_watermill">Mulino ad acqua</string>
 
 	<string name="poi_power_substation">Sottostazione</string>
 	<string name="poi_power_transformer">Trasformatore</string>
@@ -484,7 +484,7 @@
 	<string name="poi_craft_tinsmith">Lattoniere</string>
 	<string name="poi_craft_upholsterer">Tappezziere</string>
 	<string name="poi_funeral_directors">Impresa di pompe funebri</string>
-	<string name="poi_town_hall">Municipio</string>
+	<string name="poi_townhall">Municipio</string>
 	<string name="poi_research">Centro di ricerca e sviluppo</string>
 	<string name="poi_it">Ufficio IT</string>
 	<string name="poi_newspaper">Redazione giornalistica</string>
diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml
index b7bfa46739..417786d85a 100644
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-	<string name="poi_airport">空港(Aireport)</string>
+	<string name="poi_aerodrome">空港(Aireport)</string>
 	<string name="poi_bank">銀行(Bank)</string>
 	<string name="poi_bus_stop">バス停(Bus stop)</string>
 	<string name="poi_car_rental">レンタカー(Car rental)</string>
@@ -252,7 +252,7 @@
 	<string name="poi_waterway_turning_point">船舶転回所(Waterway turning point)</string>
 	<string name="poi_weir">堰(Weir)</string>
 	<string name="poi_dam">ダム(Dam)</string>
-	<string name="poi_water_mill">水車小屋(Water mill)</string>
+	<string name="poi_watermill">水車小屋(Water mill)</string>
 
 	<string name="poi_power_substation">変電所(Substation)</string>
 	<string name="poi_power_transformer">変圧器・トランス(Transformer)</string>
@@ -383,7 +383,7 @@
 	<string name="poi_lawyer">法律事務所(Lawyer)</string>
 	<string name="poi_office_telecommunication">通信会社事務所(Telecommunication office)</string>
 	<string name="poi_ngo">NGO・非政府組織(NGO)</string>
-	<string name="poi_town_hall">町役場・市庁舎(Town hall)</string>
+	<string name="poi_townhall">町役場・市庁舎(Town hall)</string>
 	<string name="poi_employment_agency">職業紹介所(Employment office)</string>
 	<string name="poi_research">研究所(Research office)</string>
 	<string name="poi_it">IT関連事務所(IT office)</string>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index 8dd684c71f..e614c6aa96 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -145,7 +145,7 @@
 	<string name="poi_subway_station">지하철 역</string>
 	<string name="poi_taxi">택시 승차장</string>
 
-	<string name="poi_airport">공항</string>
+	<string name="poi_aerodrome">공항</string>
 	<string name="poi_helipad">헬리콥터 이착륙지</string>
 	<string name="poi_runway">활주로</string>
 	<string name="poi_aeroway_terminal">Aeroway 터미널</string>
@@ -182,7 +182,7 @@
 	<string name="poi_lock_gate">게이트 잠금</string>
 	<string name="poi_waterway_turning_point">수로 터닝 포인트</string>
 	<string name="poi_dam">댐</string>
-	<string name="poi_water_mill">물방앗간</string>
+	<string name="poi_watermill">물방앗간</string>
 
 	<string name="poi_power_substation">변전소</string>
 	<string name="poi_power_transformer">변압기</string>
@@ -277,7 +277,7 @@
 	<string name="poi_lawyer">변호사</string>
 	<string name="poi_office_telecommunication">원거리 통신 사무실</string>
 	<string name="poi_ngo">NGO</string>
-	<string name="poi_town_hall">타운 홀</string>
+	<string name="poi_townhall">타운 홀</string>
 	<string name="poi_employment_agency">Employment 사무실</string>
 	<string name="poi_research">연구 사무실</string>
 	<string name="poi_it">IT 사무실</string>
diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml
index 3db1a0601a..f88e102e3f 100644
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@@ -39,7 +39,7 @@
 	<string name="poi_subway_station">T-banestasjon</string>
 	<string name="poi_taxi">Taxiholdeplass</string>
 
-	<string name="poi_airport">Flyplass</string>
+	<string name="poi_aerodrome">Flyplass</string>
 	<string name="poi_ferry_terminal">Fergeterminal</string>
 	<string name="poi_lighthouse">Fyrtårn</string>
 
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index dafbc13bed..ebf86bbc19 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -139,7 +139,7 @@
 	<string name="poi_subway_station">Metrostation</string>
 	<string name="poi_taxi">Taxistandplaats</string>
 
-	<string name="poi_airport">Luchthaven</string>
+	<string name="poi_aerodrome">Luchthaven</string>
 	<string name="poi_helipad">Helikopterplatform</string>
 	<string name="poi_runway">Landingsbaan</string>
 	<string name="poi_aeroway_terminal">Terminal</string>
@@ -209,7 +209,7 @@
 	<string name="poi_estate_agent">Vastgoedmakelaar</string>
 	<string name="poi_lawyer">Advocaat</string>
 	<string name="poi_ngo">NGO</string>
-	<string name="poi_town_hall">Stadhuis</string>
+	<string name="poi_townhall">Stadhuis</string>
 	<string name="poi_advertising_agency">Reclamebureau</string>
 	<string name="poi_educational_institution">Onderwijsinstelling</string>
 	<string name="poi_architect">Architectenkantoor</string>
@@ -433,7 +433,7 @@
 	<string name="poi_lock_gate">Schutsluis</string>
 	<string name="poi_waterway_turning_point">Zwaaikom</string>
 	<string name="poi_weir">Stuw</string>
-	<string name="poi_water_mill">Watermolen</string>
+	<string name="poi_watermill">Watermolen</string>
 
 	<string name="poi_power_substation">Onderstation</string>
 	<string name="poi_power_transformer">Transformator</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index b6ec1fac10..222079722f 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -146,7 +146,7 @@
 	<string name="poi_subway_station">Stacja metra</string>
 	<string name="poi_taxi">Postój TAXI</string>
 
-	<string name="poi_airport">Lotnisko</string>
+	<string name="poi_aerodrome">Lotnisko</string>
 	<string name="poi_helipad">Lądowisko helikopterów</string>
 	<string name="poi_runway">Pas startowy</string>
 	<string name="poi_aeroway_terminal">Terminal lotniczy</string>
@@ -188,7 +188,7 @@
 	<string name="poi_wastewater_plant">Oczyszczalnia ścieków</string>
 	<string name="poi_water_tower">Wieża ciśnień</string>
 	<string name="poi_dam">Tama</string>
-	<string name="poi_water_mill">Młyn wodny</string>
+	<string name="poi_watermill">Młyn wodny</string>
 
 	<string name="poi_power_substation">Podstacja</string>
 	<string name="poi_power_transformer">Transformator</string>
@@ -269,7 +269,7 @@
 	<string name="poi_estate_agent">Agent nieruchomości</string>
 	<string name="poi_lawyer">Prawnik</string>
 	<string name="poi_ngo">Organizacja pozarządowa</string>
-	<string name="poi_town_hall">Ratusz</string>
+	<string name="poi_townhall">Ratusz</string>
 	<string name="poi_employment_agency">Urząd pracy</string>
 	<string name="poi_advertising_agency">Agencja reklamowa</string>
 	<string name="poi_educational_institution">Instytucja edukacyjna</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index e1427fb894..9d53ba1c2c 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -147,7 +147,7 @@
 	<string name="poi_subway_station">Станция метро</string>
 	<string name="poi_taxi">Стоянка такси</string>
 
-	<string name="poi_airport">Аэропорт</string>
+	<string name="poi_aerodrome">Аэропорт</string>
 	<string name="poi_helipad">Вертолётная площадка</string>
 	<string name="poi_runway">Взлётная полоса</string>
 	<string name="poi_aeroway_terminal">Терминал аэропорта</string>
@@ -189,7 +189,7 @@
 	<string name="poi_waterway_turning_point">Поворотная точка на воде</string>
 	<string name="poi_weir">Небольшая плотина</string>
 	<string name="poi_dam">Дамба</string>
-	<string name="poi_water_mill">Водяная мельница</string>
+	<string name="poi_watermill">Водяная мельница</string>
 
 	<string name="poi_power_substation">Подстанция</string>
 	<string name="poi_power_transformer">Трансформатор</string>
@@ -271,7 +271,7 @@
 	<string name="poi_lawyer">Юридические услуги</string>
 	<string name="poi_office_telecommunication">Телекоммуникационная компания</string>
 	<string name="poi_ngo">Общественная организация</string>
-	<string name="poi_town_hall">Администрация населенного пункта</string>
+	<string name="poi_townhall">Администрация населенного пункта</string>
 	<string name="poi_employment_agency">Биржа труда</string>
 	<string name="poi_research">Исследовательский центр</string>
 	<string name="poi_it">Информационные технологии</string>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index d45ab9b323..c124a255fe 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -124,7 +124,7 @@
 	<string name="poi_subway_station">Istatzione de sa metropolitana</string>
 	<string name="poi_taxi">Postèggiu de sos taxi</string>
 
-	<string name="poi_airport">Aeroportu</string>
+	<string name="poi_aerodrome">Aeroportu</string>
 	<string name="poi_helipad">Eliportu</string>
 	<string name="poi_runway">Pista d\'aterazu</string>
 	<string name="poi_slipway">Lassinadòrju</string>
@@ -155,7 +155,7 @@
 	<string name="poi_wastewater_plant">Depuradore de sas abbas</string>
 	<string name="poi_water_tower">Turre ìdrica</string>
 	<string name="poi_dam">Diga</string>
-	<string name="poi_water_mill">Mulinu ad abba</string>
+	<string name="poi_watermill">Mulinu ad abba</string>
 
 	<string name="poi_power_transformer">Trasformadore</string>
 	<string name="poi_power_plant">Tzentrale elètrica</string>
@@ -224,7 +224,7 @@
 	<string name="poi_estate_agent">Butega immobiliare</string>
 	<string name="poi_lawyer">Abogadu</string>
 	<string name="poi_ngo">ONG</string>
-	<string name="poi_town_hall">Munitzìpiu</string>
+	<string name="poi_townhall">Munitzìpiu</string>
 	<string name="poi_employment_agency">Ufìtziu pro su traballu</string>
 	<string name="poi_it">Ufìtziu IT</string>
 	<string name="poi_newspaper">Redatzione de giornale</string>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index af0f0772d4..eda5957317 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -163,7 +163,7 @@
 	<string name="poi_railway_buffer_stop">Železničná zarážka</string>
 	<string name="poi_taxi">Stanovište taxíkov</string>
 
-	<string name="poi_airport">Letisko</string>
+	<string name="poi_aerodrome">Letisko</string>
 	<string name="poi_helipad">Plocha pre vrtuľníky</string>
 	<string name="poi_runway">Pristávacia dráha</string>
 	<string name="poi_aeroway_terminal">Terminál</string>
@@ -205,7 +205,7 @@
 	<string name="poi_waterway_turning_point">Obratisko na vode</string>
 	<string name="poi_weir">Vzdúvacia hrádza</string>
 	<string name="poi_dam">Priehrada/Hrádza</string>
-	<string name="poi_water_mill">Vodný mlyn</string>
+	<string name="poi_watermill">Vodný mlyn</string>
 
 	<string name="poi_power_substation">Elektrická stanica</string>
 	<string name="poi_power_transformer">Transformátor</string>
@@ -291,7 +291,7 @@
 	<string name="poi_lawyer">Právnik</string>
 	<string name="poi_office_telecommunication">Telekomunikácie</string>
 	<string name="poi_ngo">Nezisková organizácia</string>
-	<string name="poi_town_hall">Radnica</string>
+	<string name="poi_townhall">Radnica</string>
 	<string name="poi_employment_agency">Personálna agentúra</string>
 	<string name="poi_research">Výskumný ústav</string>
 	<string name="poi_it">Informačné technológie</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 0f18d85911..6370fe2058 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -221,7 +221,7 @@
 	<string name="poi_railway_buffer_stop">Railway buffer stop</string>
 	<string name="poi_taxi">Taxi stand</string>
 
-	<string name="poi_airport">Airport</string>
+	<string name="poi_aerodrome">Airport</string>
 	<string name="poi_helipad">Helipad</string>
 	<string name="poi_runway">Runway</string>
 	<string name="poi_aeroway_terminal">Aeroway terminal</string>
@@ -266,7 +266,7 @@
 	<string name="poi_waterway_turning_point">Waterway turning point</string>
 	<string name="poi_weir">Weir</string>
 	<string name="poi_dam">Dam</string>
-	<string name="poi_water_mill">Water mill</string>
+	<string name="poi_watermill">Water mill</string>
 
 	<string name="poi_power_substation">Substation</string>
 	<string name="poi_power_transformer">Transformer</string>
@@ -379,7 +379,7 @@
 	<string name="poi_lawyer">Lawyer</string>
 	<string name="poi_office_telecommunication">Telecommunication office</string>
 	<string name="poi_ngo">NGO</string>
-	<string name="poi_town_hall">Town hall</string>
+	<string name="poi_townhall">Town hall</string>
 	<string name="poi_employment_agency">Employment office</string>
 	<string name="poi_research">Research office</string>
 	<string name="poi_it">IT office</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 4d1248bb35..e29837f397 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -842,8 +842,8 @@ public class MapActivity extends AccessibleActivity {
 		Intent intent = getIntent();
 		if (intent != null && intent.getData() != null) {
 			Uri data = intent.getData();
-			if ("http".equalsIgnoreCase(data.getScheme()) && "download.osmand.net".equals(data.getHost())
-					&& "/go".equals(data.getPath())) {
+			if ("http".equalsIgnoreCase(data.getScheme()) && data.getHost() != null && data.getHost().contains("osmand.net") &&
+					data.getPath() != null && data.getPath().startsWith("/go")) {
 				String lat = data.getQueryParameter("lat");
 				String lon = data.getQueryParameter("lon");
 				if (lat != null && lon != null) {