diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index cb0e371203..e4f7b2e905 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -8,7 +8,7 @@
 	<string name="poi_beverages">Напоі</string>
 	<string name="poi_butcher">Ятка</string>
 	<string name="poi_deli">Дэлікатэсы</string>
-	<string name="poi_shop_farm">Фермерскія прадукты</string>
+	<string name="poi_farm">Фермерскія прадукты</string>
 	<string name="poi_greengrocer">Гародніна і садавіна</string>
 	<string name="poi_seafood">Морапрадукты</string>
 	<string name="poi_confectionery">Кандытарская</string>
@@ -39,7 +39,7 @@
 	<string name="poi_boutique">Буцік</string>
 	<string name="poi_chemist">Аптэка</string>
 	<string name="poi_clothes">Крама адзеньня</string>
-	<string name="poi_children_clothes">Дзіцячае адзеньне</string>
+	<string name="poi_child_clothes">Дзіцячае адзеньне</string>
 	<string name="poi_shoes">Крама абутку</string>
 	<string name="poi_computer">Кампутары</string>
 	<string name="poi_copyshop">Капіявальныя паслугі</string>
@@ -87,8 +87,8 @@
 	<string name="poi_window_blind">Жалюзі, аканіцы, маркізы</string>
 	<string name="poi_department_store">Універмаг</string>
 	<string name="poi_electronics">Электроніка</string>
-	<string name="poi_car_shop">Аўтасалон</string>
-	<string name="poi_car_parts_shop">Аўтазапчасткі</string>
+	<string name="poi_car">Аўтасалон</string>
+	<string name="poi_car_parts">Аўтазапчасткі</string>
 	<string name="poi_atv">Квадрацыклы</string>
 	<string name="poi_cosmetics">Касметыка, парфумерыя</string>
 	<string name="poi_marketplace">Рынак</string>
@@ -147,7 +147,6 @@
 	<string name="poi_bus_station">Аўтобусная станцыя</string>
 	<string name="poi_railway_station">Чыгуначная станцыя</string>
 	<string name="poi_railway_platform">Чыгуначная плятформа</string>
-	<string name="poi_railway_halt">Чыгуначная плятформа (састар.)</string>
 	<string name="poi_railway_subway_entrance">Уваход у мэтро</string>
 	<string name="poi_subway_station">Станцыя мэтро</string>
 	<string name="poi_taxi">Стаянка таксі</string>
@@ -368,7 +367,7 @@
 	<string name="poi_archaeological_site">Раскопы</string>
 	<string name="poi_battlefield">Поле бітвы</string>
 	<string name="poi_boundary_stone">Межавы камень</string>
-	<string name="poi_cannon">Гістарычныя гарматы</string>
+	<string name="poi_historic_cannon">Гістарычныя гарматы</string>
 	<string name="poi_castle">Замак</string>
 	<string name="poi_city_gate">Гарадзкая брама</string>
 	<string name="poi_fort">Фартыфікацыйныя збудаваньні</string>
@@ -668,10 +667,8 @@
 	<string name="poi_man_made">Антрапагеннае</string>
 	<string name="poi_apartment">Апартамэнты</string>
 
-	<string name="poi_child_clothes">Дзіцячае адзеньне</string>
 	<string name="poi_wine">Вінная крама</string>
 
-	<string name="poi_car_parts">Аўтазапчасткі</string>
 	<string name="poi_public_transport_stop_position">Месца прыпынку грамадзкага транспарту</string>
 	<string name="poi_halt">Чыгуначны прыпынак</string>
 	<string name="poi_internet_access_wlan">Доступ у Інтэрнэт: WLAN</string>
@@ -680,8 +677,6 @@
 	<string name="poi_internet_access_public">Доступ у Інтэрнэт: агульны</string>
 	<string name="poi_internet_access_service">Доступ у Інтэрнэт: паслугі</string>
 	
-	<string name="poi_farm">Фермэрская крама</string>
-	<string name="poi_car">Аўтакрама</string>
 	<string name="poi_lodging">Начлег</string>
 	<string name="poi_railway_buffer_stop">Чыгуначны тупіковы ўпор</string>
 	<string name="poi_club">Клюб</string>
@@ -716,16 +711,16 @@
 	<string name="poi_silo">Сілас</string>
 	<string name="poi_storage_tank">Бак (рэзэрвуар)</string>
 
-	<string name="piste_nordic">Лыжня</string>
-	<string name="piste_snow_park">Сноўпарк</string>
-	<string name="piste_playground">Вучэбны схіл</string>
-	<string name="piste_downhill">Гарналыжная траса</string>
-	<string name="piste_skitour">Скітур</string>
-	<string name="piste_ice_skate">Канькабежная траса</string>
+	<string name="poi_piste_nordic">Лыжня</string>
+	<string name="poi_piste_snow_park">Сноўпарк</string>
+	<string name="poi_piste_playground">Вучэбны схіл</string>
+	<string name="poi_piste_downhill">Гарналыжная траса</string>
+	<string name="poi_piste_skitour">Скітур</string>
+	<string name="poi_piste_ice_skate">Канькабежная траса</string>
 
-	<string name="piste_sled">Санкавы схіл</string>
-	<string name="piste_sleigh">Нартавая дарога</string>
-	<string name="piste_hike">Сьцежка</string>
+	<string name="poi_piste_sled">Санкавы схіл</string>
+	<string name="poi_piste_sleigh">Нартавая дарога</string>
+	<string name="poi_piste_hike">Сьцежка</string>
 	<string name="poi_canal">Канал</string>
 	<string name="poi_bench">Лаўка</string>
 	<string name="poi_water">Вада</string>
@@ -735,29 +730,29 @@
 	<string name="poi_valley">Даліна</string>
 	<string name="poi_wood">Лес</string>
 	<string name="poi_landuse">Землекарыстаньне</string>
-	<string name="poi_fuel_diesel_yes">Дызэль</string>
-	<string name="poi_fuel_gtl_diesel_yes">GTL-дызэль</string>
-	<string name="poi_fuel_hgv_diesel_yes">HGV-дызэль</string>
-	<string name="poi_fuel_biodiesel_yes">Біядызэль</string>
-	<string name="poi_fuel_lpg_yes">Звадкаваны газ</string>
-	<string name="poi_fuel_octane_80_yes">Актан 80</string>
-	<string name="poi_fuel_octane_91_yes">Актан 91</string>
-	<string name="poi_fuel_octane_92_yes">Актан 92</string>
-	<string name="poi_fuel_octane_95_yes">Актан 95</string>
-	<string name="poi_fuel_octane_98_yes">Актан 98</string>
-	<string name="poi_fuel_octane_100_yes">Актан 100</string>
-	<string name="poi_fuel_cng_yes">Сьціснуты прыродны газ</string>
-	<string name="poi_fuel_1_25_yes">Паліва 1:25</string>
-	<string name="poi_fuel_1_50_yes">Паліва 1:50</string>
-	<string name="poi_fuel_ethanol_yes">Этаноль</string>
-	<string name="poi_fuel_methanol_yes">Мэтаноль</string>
-	<string name="poi_fuel_svo_yes">Алейнае паліва</string>
-	<string name="poi_fuel_e10_yes">E10</string>
-	<string name="poi_fuel_e20_yes">E20</string>
-	<string name="poi_fuel_e85_yes">E85</string>
-	<string name="poi_fuel_biogas_yes">E85</string>
-	<string name="poi_fuel_LH2_yes">Вадкі вадарод</string>
-	<string name="poi_fuel_electricity_yes">Электрычнасьць</string>
+	<string name="poi_fuel:diesel">Дызэль</string>
+	<string name="poi_fuel:gtl_diesel">GTL-дызэль</string>
+	<string name="poi_fuel:hgv_diesel">HGV-дызэль</string>
+	<string name="poi_fuel:biodiesel">Біядызэль</string>
+	<string name="poi_fuel:lpg">Звадкаваны газ</string>
+	<string name="poi_fuel:octane_80">Актан 80</string>
+	<string name="poi_fuel:octane_91">Актан 91</string>
+	<string name="poi_fuel:octane_92">Актан 92</string>
+	<string name="poi_fuel:octane_95">Актан 95</string>
+	<string name="poi_fuel:octane_98">Актан 98</string>
+	<string name="poi_fuel:octane_100">Актан 100</string>
+	<string name="poi_fuel:cng">Сьціснуты прыродны газ</string>
+	<string name="poi_fuel:1_25">Паліва 1:25</string>
+	<string name="poi_fuel:1_50">Паліва 1:50</string>
+	<string name="poi_fuel:ethanol">Этаноль</string>
+	<string name="poi_fuel:methanol">Мэтаноль</string>
+	<string name="poi_fuel:svo">Алейнае паліва</string>
+	<string name="poi_fuel:e10">E10</string>
+	<string name="poi_fuel:e20">E20</string>
+	<string name="poi_fuel:e85">E85</string>
+	<string name="poi_fuel:biogas">E85</string>
+	<string name="poi_fuel:lh2">Вадкі вадарод</string>
+	<string name="poi_fuel:electricity">Электрычнасьць</string>
 	<string name="poi_farmyard">Падворак</string>
 	<string name="poi_meadow">Луг</string>
 
@@ -770,4 +765,8 @@
 	<string name="poi_landuse_railway">Чыгуначная паласа</string>
 
 	<string name="poi_junction">Перакрыжаваньне</string>
+	<string name="poi_sailing">Парусны спорт</string>
+	<string name="poi_charity">Дабрачынная крама</string>
+	<string name="poi_photo">Фота</string>
+	<string name="poi_tomb">Магіла</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index d6cbf2b461..70b2a7545e 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -25,7 +25,7 @@
 	<string name="poi_optician">Optometria</string>
 	<string name="poi_convenience">Botiga de queviures</string>
 	<string name="poi_deli">Delicadeses</string>
-	<string name="poi_shop_farm">Productes de granja</string>
+	<string name="poi_farm">Productes de granja</string>
 	<string name="poi_greengrocer">Verdureria</string>
 	<string name="poi_confectionery">Confiteria</string>
 	<string name="poi_ice_cream">Gelateria</string>
@@ -115,14 +115,14 @@
 	<string name="poi_tobacco">Venda de tabac</string>
 	<string name="poi_carpet">Botiga de catifes</string>
 	<string name="poi_clothes">Magatzem de roba</string>
-	<string name="poi_children_clothes">Roba infantil</string>
+	<string name="poi_child_clothes">Roba infantil</string>
 	<string name="poi_curtain">Pelleteria</string>
 	<string name="poi_fabric">Botiga de teixits</string>
 	<string name="poi_public_transport_platform">Parada de transport públic</string>
 	<string name="poi_bus_station">Estació d\'autobusos</string>
 	<string name="poi_railway_station">Estació de tren</string>
 	<string name="poi_railway_platform">Andana</string>
-	<string name="poi_railway_halt">Parada de tren (obsolet)</string>
+	<string name="poi_halt">Parada de tren (obsolet)</string>
 	<string name="poi_railway_subway_entrance">Entrada de metro</string>
 	<string name="poi_subway_station">Estació de metro</string>
 	<string name="poi_taxi">Parada de taxis</string>
@@ -305,7 +305,7 @@
 	<string name="poi_bedding">Matalasseria</string>
 	<string name="poi_gas">Gas liquat</string>
 	<string name="poi_department_store">Gran magatzem</string>
-	<string name="poi_car_parts_shop">Recanvis d\'automòbil</string>
+	<string name="poi_car_parts">Recanvis d\'automòbil</string>
 	<string name="poi_fire_water_pond">Punt d\'aigua per incendis</string>
 	<string name="poi_grit_bin">Reserva de sal</string>
 	<string name="poi_emergency_access_point">Punt d\'accés d\'emergència</string>
@@ -340,7 +340,7 @@
 	<string name="poi_museum">Museu</string>
 	<string name="poi_archaeological_site">Restes arqueològiques</string>
 	<string name="poi_boundary_stone">Fita de terme</string>
-	<string name="poi_cannon">Canó històric</string>
+	<string name="poi_historic_cannon">Canó històric</string>
 	<string name="poi_castle">Castell</string>
 	<string name="poi_fort">Fortalesa</string>
 	<string name="poi_rune_stone">Pedra rúnica</string>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index 672441e220..2585472343 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -6,7 +6,7 @@
 	<string name="poi_beverages">Obchod s nápoji</string>
 	<string name="poi_butcher">Masna</string>
 	<string name="poi_deli">Delikatesy</string>
-	<string name="poi_shop_farm">Farmářský obchod</string>
+	<string name="poi_farm">Farmářský obchod</string>
 	<string name="poi_greengrocer">Zelinářství</string>
 	<string name="poi_seafood">Obchod mořskými plody</string>
 	<string name="poi_supermarket">Supermarket</string>
@@ -18,7 +18,7 @@
 	<string name="poi_bed">Vybavení ložnic</string>
 	<string name="poi_boutique">Módní butik</string>
 	<string name="poi_chemist">Drogerie</string>
-	<string name="poi_children_clothes">Dětské oblečení</string>
+	<string name="poi_child_clothes">Dětské oblečení</string>
 	<string name="poi_shoes">Obuv</string>
 	<string name="poi_hardware">Železářství</string>
 	<string name="poi_tobacco">Tabák</string>
@@ -86,10 +86,10 @@
 	<string name="poi_first_aid">První pomoc</string>
 	<string name="poi_dentist">Zubař</string>
 	<string name="poi_veterinary">Veterinář</string>
-	<string name="blood_bank">Krevní banka</string>
-	<string name="optometrist">Optik</string>
-	<string name="physiotherapist">Fyzioterapeut</string>
-	<string name="psychotherapist">Psychoterapeut</string>
+	<string name="poi_blood_bank">Krevní banka</string>
+	<string name="poi_optometrist">Optik</string>
+	<string name="poi_physiotherapist">Fyzioterapeut</string>
+	<string name="poi_psychotherapist">Psychoterapeut</string>
 
 	<string name="poi_company">Společnost</string>
 	<string name="poi_insurance">Pojištění</string>
@@ -230,7 +230,6 @@
 	<string name="poi_osmwiki">Wikipedia</string>
 	<string name="poi_user_defined_other">Uživatelsky definovaný</string>
 	
-	<string name="poi_farm">Farmářský obchod</string>
 	<string name="poi_wine">Vinotéka</string>
 
 	<string name="poi_shop">Obchod</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index c4bb338e4e..f6e47c81ff 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -7,7 +7,7 @@
         <string name="poi_beverages">Drikkevarebutik</string>
         <string name="poi_butcher">Kødmarked</string>
         <string name="poi_deli">Delikatesse</string>
-        <string name="poi_shop_farm">Gårdbutik</string>
+        <string name="poi_farm">Gårdbutik</string>
         <string name="poi_greengrocer">Grønthandler</string>
         <string name="poi_seafood">Fiskehandler</string>
         <string name="poi_confectionery">Konfektureforretning</string>
@@ -30,7 +30,6 @@
         <string name="poi_carpet">Tæppeforretning</string>
         <string name="poi_chemist">Materialist</string>
         <string name="poi_clothes">Tøjbutik</string>
-        <string name="poi_children_clothes">Børnetøj</string>
         <string name="poi_shoes">Skobutik</string>
         <string name="poi_computer">Computerbutik</string>
         <string name="poi_copyshop">Kopicenter</string>
@@ -84,8 +83,8 @@
         <string name="poi_window_blind">Persienner</string>
         <string name="poi_department_store">Stormagasin</string>
         <string name="poi_electronics">Elektronik</string>
-        <string name="poi_car_shop">Autohandel</string>
-        <string name="poi_car_parts_shop">Biltilbehør</string>
+        <string name="poi_car">Autohandel</string>
+        <string name="poi_car_parts">Biltilbehør</string>
         <string name="poi_atv">ATV</string>
         <string name="poi_cosmetics">Kosmetik</string>
         <string name="poi_marketplace">Markedsplads</string>
@@ -143,7 +142,6 @@
         <string name="poi_bus_station">Busstation</string>
         <string name="poi_railway_station">Banegård</string>
         <string name="poi_railway_platform">Perron</string>
-        <string name="poi_railway_halt">Trinbrædt (forældet)</string>
         <string name="poi_railway_subway_entrance">Metroindgang</string>
         <string name="poi_subway_station">Metrostation</string>
         <string name="poi_taxi">Taxaholdeplads</string>
@@ -252,19 +250,6 @@
         <string name="poi_baby_hatch">Babyluge</string>
         <string name="poi_veterinary">Dyrlæge</string>
         <string name="poi_sanatorium">Sanatorium</string>
-        <string name="healthcare_alternative">Sundhedspleje alternativ</string>
-        <string name="audiologist">Audiolog</string>
-        <string name="blood_bank">Blodbank</string>
-        <string name="healthcare_centre">Sundhedspleje alternativ</string>
-        <string name="midwife">Jordemoder</string>
-        <string name="occupational_therapist">Ergoterapeut</string>
-        <string name="optometrist">Optometrist</string>
-        <string name="physiotherapist">Fysioterapeut</string>
-        <string name="podiatrist">Ortopæd</string>
-        <string name="psychotherapist">Psykoterapeut</string>
-        <string name="healthcare_rehabilitation">Rehabilitering</string>
-        <string name="speech_therapist">Talepædagog</string>
-        <string name="healthcare_yes">Sundhedspleje</string>
 
         <string name="poi_company">Firma</string>
         <string name="poi_insurance">Forsikring</string>
@@ -644,7 +629,7 @@
 	<string name="poi_canadian_football">Canadisk fodbold</string>
 	<string name="poi_surfing">Surfing</string>
 	<string name="poi_base">Base jumping</string>
-	<string name="poi_cannon">Historisk kanon</string>
+	<string name="poi_historic_cannon">Historisk kanon</string>
 	<string name="poi_harbour">Havn</string>
 	<string name="poi_dock">Dok</string>
 	<string name="poi_attraction_amusement_ride">Forlystelse</string>
@@ -687,8 +672,6 @@
 	<string name="poi_child_clothes">Børnetøj</string>
 	<string name="poi_apartment">Lejlighed</string>
 
-	<string name="poi_farm">Gårdbutik</string>
-	<string name="poi_car_parts">Bilreservedele</string>
 	<string name="poi_public_transport_stop_position">Offentlig transport stoppested</string>
 	<string name="poi_halt">Jernbane stop</string>
 	<string name="poi_lodging">Logi</string>
@@ -699,7 +682,6 @@
 	<string name="poi_internet_access_service">Internetadgang: service</string>
 	
 	
-	<string name="poi_car">Bilforhandler</string>
 	<string name="poi_railway_buffer_stop">Jernbane sporstopper</string>
 	<string name="poi_wine">Vinhandel</string>
 
@@ -734,15 +716,15 @@
 	<string name="poi_silo">Silo</string>
 	<string name="poi_storage_tank">Lagertank</string>
 
-	<string name="piste_downhill">Styrtløb</string>
-	<string name="piste_nordic">Langrend</string>
-	<string name="piste_skitour">Skitouring</string>
-	<string name="piste_hike">Vandring</string>
-	<string name="piste_sleigh">Kane</string>
-	<string name="piste_sled">Slæde</string>
-	<string name="piste_snow_park">Snepark</string>
-	<string name="piste_playground">Snelegeplads</string>
-	<string name="piste_ice_skate">Isskøjte</string>
+	<string name="poi_piste_downhill">Styrtløb</string>
+	<string name="poi_piste_nordic">Langrend</string>
+	<string name="poi_piste_skitour">Skitouring</string>
+	<string name="poi_piste_hike">Vandring</string>
+	<string name="poi_piste_sleigh">Kane</string>
+	<string name="poi_piste_sled">Slæde</string>
+	<string name="poi_piste_snow_park">Snepark</string>
+	<string name="poi_piste_playground">Snelegeplads</string>
+	<string name="poi_piste_ice_skate">Isskøjte</string>
 
 	<string name="poi_gasometer">Gasbeholder</string>
 	<string name="poi_allotments">Kolonihaver</string>
@@ -754,29 +736,29 @@
 	<string name="poi_water">Vand</string>
 	<string name="poi_wood">Træ</string>
 	<string name="poi_landuse">Arealanvendelse</string>
-	<string name="poi_fuel_diesel_yes">Diesel</string>
-	<string name="poi_fuel_gtl_diesel_yes">GTL diesel</string>
-	<string name="poi_fuel_hgv_diesel_yes">HGV diesel</string>
-	<string name="poi_fuel_biodiesel_yes">Bio-diesel</string>
-	<string name="poi_fuel_lpg_yes">LPG</string>
-	<string name="poi_fuel_octane_80_yes">Oktan 80</string>
-	<string name="poi_fuel_octane_91_yes">Oktan 91</string>
-	<string name="poi_fuel_octane_92_yes">Oktan 92</string>
-	<string name="poi_fuel_octane_95_yes">Oktan 95</string>
-	<string name="poi_fuel_octane_98_yes">Oktan 98</string>
-	<string name="poi_fuel_octane_100_yes">Oktan 100</string>
-	<string name="poi_fuel_cng_yes">CNG</string>
-	<string name="poi_fuel_1_25_yes">1:25 benzin</string>
-	<string name="poi_fuel_1_50_yes">1:50 benzin</string>
-	<string name="poi_fuel_ethanol_yes">Ethanol</string>
-	<string name="poi_fuel_methanol_yes">Methanol</string>
-	<string name="poi_fuel_svo_yes">SVO</string>
-	<string name="poi_fuel_e10_yes">E10</string>
-	<string name="poi_fuel_e20_yes">E20</string>
-	<string name="poi_fuel_e85_yes">E85</string>
-	<string name="poi_fuel_biogas_yes">E85</string>
-	<string name="poi_fuel_LH2_yes">Flydende brint</string>
-	<string name="poi_fuel_electricity_yes">Elektricitet</string>
+	<string name="poi_fuel:diesel">Diesel</string>
+	<string name="poi_fuel:gtl_diesel">GTL diesel</string>
+	<string name="poi_fuel:hgv_diesel">HGV diesel</string>
+	<string name="poi_fuel:biodiesel">Bio-diesel</string>
+	<string name="poi_fuel:lpg">LPG</string>
+	<string name="poi_fuel:octane_80">Oktan 80</string>
+	<string name="poi_fuel:octane_91">Oktan 91</string>
+	<string name="poi_fuel:octane_92">Oktan 92</string>
+	<string name="poi_fuel:octane_95">Oktan 95</string>
+	<string name="poi_fuel:octane_98">Oktan 98</string>
+	<string name="poi_fuel:octane_100">Oktan 100</string>
+	<string name="poi_fuel:cng">CNG</string>
+	<string name="poi_fuel:1_25">1:25 benzin</string>
+	<string name="poi_fuel:1_50">1:50 benzin</string>
+	<string name="poi_fuel:ethanol">Ethanol</string>
+	<string name="poi_fuel:methanol">Methanol</string>
+	<string name="poi_fuel:svo">SVO</string>
+	<string name="poi_fuel:e10">E10</string>
+	<string name="poi_fuel:e20">E20</string>
+	<string name="poi_fuel:e85">E85</string>
+	<string name="poi_fuel:biogas">E85</string>
+	<string name="poi_fuel:lh2">Flydende brint</string>
+	<string name="poi_fuel:electricity">Elektricitet</string>
 	<string name="poi_industrial">Industriområde</string>
 	<string name="poi_farmyard">Gårdsplads</string>
 	<string name="poi_meadow">Eng</string>
@@ -785,7 +767,11 @@
 	<string name="poi_residential">Boligområde</string>
 
 	<string name="poi_recreation_ground">Rekreativtområde</string>
-	<string name="poi_village_green">Grønning</string>
+	<string name="poi_village_green">Forte</string>
 
 	<string name="poi_junction">Vejkryds</string>
+	<string name="poi_sailing">Sejlads</string>
+	<string name="poi_charity">Genbrugsbutik</string>
+	<string name="poi_photo">Fotoforretning</string>
+	<string name="poi_tomb">Grav</string>
 	</resources>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 6fd9993748..9dca1650a7 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -92,11 +92,11 @@
 	<string name="poi_camp_site">Campingplatz</string>
 	<string name="poi_canoe">Kanu</string>
 	<string name="poi_cape">Kap</string>
-	<string name="poi_car_parts_shop">Autoteilehändler</string>
+	<string name="poi_car_parts">Autoteilehändler</string>
 	<string name="poi_car_rental">Autovermietung</string>
 	<string name="poi_car_repair">Kfz-Werkstatt</string>
 	<string name="poi_car_sharing">Fahrgemeinschaft</string>
-	<string name="poi_car_shop">Autohändler</string>
+	<string name="poi_car">Autohändler</string>
 	<string name="poi_car_wash">Autowaschanlage</string>
 	<string name="poi_caravan_site">Campingplatz</string>
 	<string name="poi_craft_carpenter">Tischler</string>
@@ -111,7 +111,7 @@
 	<string name="poi_charging_station">Ladestation</string>
 	<string name="poi_chemist">Drogerie</string>
 	<string name="poi_chess">Schach</string>
-	<string name="poi_children_clothes">Kinderbekleidungsgeschäft</string>
+	<string name="poi_child_clothes">Kinderbekleidungsgeschäft</string>
 	<string name="poi_cinema">Kino</string>
 	<string name="poi_circus">Zirkus</string>
 	<string name="poi_city">Stadt</string>
@@ -397,7 +397,7 @@
 	<string name="poi_raceway">Gerinne</string>
 	<string name="poi_racquet">Schläger</string>
 	<string name="poi_radiotechnics">Radiotechniker</string>
-	<string name="poi_railway_halt">Eisenbahnhaltestelle (obsolet)</string>
+	<string name="poi_halt">Eisenbahnhaltestelle (obsolet)</string>
 	<string name="poi_railway_platform">Bahnsteig (obsolet)</string>
 	<string name="poi_railway_station">Bahnhof (obsolet)</string>
 	<string name="poi_rapids">Stromschnelle</string>
@@ -482,7 +482,7 @@
 	<string name="poi_craft_shoemaker">Schuster</string>
 	<string name="poi_shoes">Schuhgeschäft</string>
 	<string name="poi_shooting">Schießbude</string>
-	<string name="poi_shop_farm">Landwirtschaft</string>
+	<string name="poi_farm">Landwirtschaft</string>
 	<string name="poi_shop_tea">Tee-Haus</string>
 	<string name="poi_sinkhole">Senkgrube</string>
 	<string name="poi_skateboard">Skateboard</string>
@@ -593,7 +593,7 @@
 	<string name="poi_bmx">BMX</string>
 	<string name="poi_canadian_football">Kanad. Football</string>
 	<string name="poi_surfing">Surfen</string>
-	<string name="poi_cannon">Historische Kanone</string>
+	<string name="poi_historic_cannon">Historische Kanone</string>
 	<string name="poi_harbour">Hafen</string>
 	<string name="poi_dock">Dock</string>
 	<string name="poi_attraction_amusement_ride">Vergnügungsfahrt</string>
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index 29dd147593..cd37ee7afc 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -10,7 +10,7 @@
 <string name="poi_beverages">فروشگاه محصولات غذایی</string>
 <string name="poi_butcher">قصابی</string>
 <string name="poi_deli">بقالی</string>
-<string name="poi_shop_farm">فروشگاه محصولات دامی</string>
+<string name="poi_farm">فروشگاه محصولات دامی</string>
 <string name="poi_greengrocer">سبزی فروشی</string>
 <string name="poi_seafood">فروشگاه غذاهای دریایی</string>
 <string name="poi_confectionery">شیرینی فروشی</string>
@@ -33,7 +33,7 @@
 <string name="poi_carpet">فروشگاه فرش</string>
 <string name="poi_chemist">فروشگاه مواد مخدر</string>
 <string name="poi_clothes">فروشگاه پوشاک</string>
-<string name="poi_children_clothes">\فروشگاه پوشاک کودکان</string>
+<string name="poi_child_clothes">\فروشگاه پوشاک کودکان</string>
 <string name="poi_shoes">کفش فروشی</string>
 <string name="poi_computer">فروشگاه کامپیوتر</string>
 <string name="poi_copyshop">فروشگاه چاپ و تکثیر</string>
@@ -87,8 +87,8 @@
 <string name="poi_window_blind">در و پنجره سازی</string>
 <string name="poi_department_store">بخش فروش</string>
 <string name="poi_electronics">فروشگاه های لوازم الکترونیکی</string>
-<string name="poi_car_shop">فروشگاه ماشین</string>
-<string name="poi_car_parts_shop">فروشگاه قطعات خودرو</string>
+<string name="poi_car">فروشگاه ماشین</string>
+<string name="poi_car_parts">فروشگاه قطعات خودرو</string>
 <string name="poi_atv">Quad store</string>
 <string name="poi_cosmetics">آرایشی و بهداشتی</string>
 <string name="poi_marketplace">بازار</string>
@@ -146,7 +146,7 @@
 <string name="poi_bus_station">ایستگاه اتوبوس (منسوخ)</string>
 <string name="poi_railway_station">ایستگاه راه آهن (منسوخ)</string>
 <string name="poi_railway_platform">پلت فرم راه آهن (منسوخ)</string>
-<string name="poi_railway_halt">ایستگاه راه آهن (منسوخ)</string>
+<string name="poi_halt">ایستگاه راه آهن (منسوخ)</string>
 <string name="poi_railway_subway_entrance">ورودی مترو</string>
 <string name="poi_subway_station">ایستگاه مترو</string>
 <string name="poi_taxi">ایستگاه تاکسی</string>
@@ -371,7 +371,7 @@
 <string name="poi_archaeological_site">مرکز باستان شناسی</string>
 <string name="poi_battlefield">میدان جنگ</string>
 <string name="poi_boundary_stone">سنگ یادبود</string>
-<string name="poi_cannon">توپ تاریخی</string>
+<string name="poi_historic_cannon">توپ تاریخی</string>
 <string name="poi_castle">قلعه</string>
 <string name="poi_city_gate">دروازه شهرستان</string>
 <string name="poi_fort">برج و بارو</string>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 33a9ed8570..55d3b7fcb2 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -65,7 +65,7 @@
 	<string name="poi_buoy_isolated_danger">Bouée de danger isolé (balise flottante)</string>
 	<string name="poi_buoy_lateral">Bouée latérale (balise flottante)</string>
 	<string name="poi_buoy_safe_water">Bouée d\'eaux saines (balise flottante)</string>
-	<string name="poi_seamark_uoy_special_purpose">Marque spéciale (balise flottante)</string>
+	<string name="poi_buoy_special_purpose">Marque spéciale (balise flottante)</string>
 	<string name="poi_bus_station">Gare routière</string>
 	<string name="poi_bus_stop">Arrêt de bus</string>
 	<string name="poi_butcher">Boucherie - Charcuterie</string>
@@ -73,8 +73,8 @@
 	<string name="poi_camp_site">Camping</string>
 	<string name="poi_canoe">Canoë-kayak</string>
 	<string name="poi_cape">Cap</string>
-	<string name="poi_car_shop">Magasin de voitures</string>
-	<string name="poi_car_parts_shop">Pièces d\'automobile</string>
+	<string name="poi_car">Magasin de voitures</string>
+	<string name="poi_car_parts">Pièces d\'automobile</string>
 	<string name="poi_car_rental">Location de voitures</string>
 	<string name="poi_car_repair">Atelier de réparation automobile</string>
 	<string name="poi_car_sharing">Autopartage</string>
@@ -275,7 +275,6 @@
 	<string name="poi_raceway">Circuit</string>
 	<string name="poi_racquet">Sport de raquette</string>
 	<string name="poi_radar_transponder">Transpondeur radar (amer)</string>
-	<string name="poi_railway_halt">Gare ferroviaire (halte)</string>
 	<string name="poi_railway_platform">Quai de gare</string>
 	<string name="poi_railway_station">Gare ferroviaire</string>
 	<string name="poi_rapids">Rapides</string>
@@ -286,7 +285,6 @@
 	<string name="poi_restaurant">Restaurant</string>
 	<string name="poi_ridge">Crête</string>
 	<string name="poi_river">Rivière</string>
-	<string name="poi_rugby">Rugby</string>
 	<string name="poi_historic_ruins">Ruines historiques</string>
 	<string name="poi_salt_pond">Marais salants</string>
 	<string name="poi_sanatorium">Sanatorium</string>
@@ -403,7 +401,7 @@
 	<string name="poi_chess">Échecs</string>
 	<string name="poi_palaeontological_site">Site paléontologique</string>
 
-	<string name="poi_shop_farm">Vente à la ferme</string>
+	<string name="poi_farm">Vente à la ferme</string>
 	<string name="poi_anime">Librairie spécialisée en bandes dessinées</string>
 	<string name="poi_antiques">Antiquaire</string>
 	<string name="poi_hunting">Equipement de chasse</string>
@@ -462,7 +460,6 @@
 	<string name="poi_fjord">Fjord</string>
 	<string name="poi_anchorage">Mouillage</string>
 	<string name="poi_seamark_building">Bâtiment remarquable (amer)</string>
-	<string name="poi_buoy_special_purpose">Marque spéciale (balise flottante)</string>
 	<string name="poi_dry_dock">Cale sèche</string>
 	<string name="poi_mooring">Mouillage</string>
 	<string name="poi_seamark_wreck">Épave</string>
@@ -536,7 +533,7 @@
 	<string name="poi_frame">Magasin d\'encadrement</string>
 	<string name="poi_bathroom_furnishing">Magasin d\'équipement pour la salle de bain</string>
 	<string name="poi_bed">Magasin d\'équipement pour la chambre</string>
-	<string name="poi_children_clothes">Vêtements pour enfants</string>
+	<string name="poi_child_clothes">Vêtements pour enfants</string>
 	<string name="poi_curtain">Boutique de rideaux</string>
 	<string name="poi_dairy">Crèmerie</string>
 	<string name="poi_baby_goods">Articles pour bébé</string>
@@ -570,7 +567,7 @@
 	<string name="poi_running_track">Piste de course</string>
 	<string name="poi_base">Saut B.A.S.E.</string>
 	<string name="poi_roller_skating">Roller skating</string>
-	<string name="poi_cannon">Canon historique</string>
+	<string name="poi_historic_cannon">Canon historique</string>
 	<string name="poi_club_automobile">Club automobile</string>
 	<string name="poi_club_history">Association du patrimoine</string>
 	<string name="poi_harbour">Port</string>
@@ -651,12 +648,8 @@
 	<string name="poi_user_defined_other">Défini par l\'utilisateur</string>
 	
 	<string name="poi_military_landuse">Zone militaire</string>
-	<string name="poi_farm">Vente à la ferme</string>
 	<string name="poi_wine">Caviste</string>
 
-	<string name="poi_child_clothes">Vêtements pour enfants</string>
-	<string name="poi_car">Concessionnaire automobile</string>
-	<string name="poi_car_parts">Pièces automobiles</string>
 	<string name="poi_public_transport_stop_position">Arrêt de transports en commun</string>
 	<string name="poi_halt">Arrêt ferroviaire</string>
 	<string name="poi_lodging">Hébergement</string>
@@ -697,40 +690,40 @@
 	<string name="poi_rest_area">Aire de repos</string>
 
 	<string name="poi_reservoir">Réservoir</string>
-	<string name="piste_ice_skate">Patinoire</string>
+	<string name="poi_piste_ice_skate">Patinoire</string>
 
 	<string name="poi_gasometer">Réservoir de gaz</string>
 	<string name="poi_silo">Silo</string>
 	<string name="poi_storage_tank">Réservoir de stockage</string>
 
-	<string name="piste_downhill">Ski alpin</string>
-	<string name="piste_nordic">Ski nordique</string>
-	<string name="piste_skitour">Ski de randonnée</string>
-	<string name="piste_hike">Randonnée</string>
-	<string name="piste_sleigh">Traîneau</string>
-	<string name="piste_sled">Luge</string>
-	<string name="piste_snow_park">Snow park</string>
-	<string name="piste_playground">Jardin de neige</string>
+	<string name="poi_piste_downhill">Ski alpin</string>
+	<string name="poi_piste_nordic">Ski nordique</string>
+	<string name="poi_piste_skitour">Ski de randonnée</string>
+	<string name="poi_piste_hike">Randonnée</string>
+	<string name="poi_piste_sleigh">Traîneau</string>
+	<string name="poi_piste_sled">Luge</string>
+	<string name="poi_piste_snow_park">Snow park</string>
+	<string name="poi_piste_playground">Jardin de neige</string>
 	<string name="poi_canal">Canal</string>
 	<string name="poi_bench">Banc</string>
 	<string name="poi_valley">Vallée</string>
 	<string name="poi_water">Eau</string>
 	<string name="poi_wood">Bois</string>
 	<string name="poi_allotments">Lotissement</string>
-	<string name="poi_fuel_octane_80_yes">Octane 80</string>
-	<string name="poi_fuel_octane_91_yes">Octane 91</string>
-	<string name="poi_fuel_octane_92_yes">Octane 92</string>
-	<string name="poi_fuel_octane_95_yes">Octane 95</string>
-	<string name="poi_fuel_octane_98_yes">Octane 98</string>
-	<string name="poi_fuel_octane_100_yes">Octane 100</string>
-	<string name="poi_fuel_ethanol_yes">Éthanol</string>
-	<string name="poi_fuel_methanol_yes">Méthanol</string>
-	<string name="poi_fuel_e85_yes">E85</string>
-	<string name="poi_fuel_biogas_yes">E85</string>
-	<string name="poi_fuel_e20_yes">E20</string>
-	<string name="poi_fuel_LH2_yes">Hydrogène liquide</string>
-	<string name="poi_fuel_electricity_yes">Électricité</string>
-	<string name="poi_fuel_e10_yes">E10</string>
+	<string name="poi_fuel:octane_80">Octane 80</string>
+	<string name="poi_fuel:octane_91">Octane 91</string>
+	<string name="poi_fuel:octane_92">Octane 92</string>
+	<string name="poi_fuel:octane_95">Octane 95</string>
+	<string name="poi_fuel:octane_98">Octane 98</string>
+	<string name="poi_fuel:octane_100">Octane 100</string>
+	<string name="poi_fuel:ethanol">Éthanol</string>
+	<string name="poi_fuel:methanol">Méthanol</string>
+	<string name="poi_fuel:e85">E85</string>
+	<string name="poi_fuel:biogas">E85</string>
+	<string name="poi_fuel:e20">E20</string>
+	<string name="poi_fuel:lh2">Hydrogène liquide</string>
+	<string name="poi_fuel:electricity">Électricité</string>
+	<string name="poi_fuel:e10">E10</string>
 	<string name="poi_farmyard">Cour de ferme</string>
 	<string name="poi_meadow">Prairie</string>
 	<string name="poi_recreation_ground">Terrain de jeu</string>
@@ -738,19 +731,22 @@
 	<string name="poi_residential">Zone résidentielle</string>
 
 	<string name="poi_landuse">Occupation du sol</string>
-	<string name="poi_fuel_diesel_yes">Gazole</string>
-	<string name="poi_fuel_gtl_diesel_yes">Gazole liquéfié</string>
-	<string name="poi_fuel_hgv_diesel_yes">Gazole poids lourds</string>
-	<string name="poi_fuel_biodiesel_yes">Bio-gazole</string>
-	<string name="poi_fuel_lpg_yes">GPL</string>
-	<string name="poi_fuel_cng_yes">Gaz naturel compressé</string>
-	<string name="poi_fuel_1_25_yes">Carburant 1:25</string>
-	<string name="poi_fuel_1_50_yes">Carburant 1:50</string>
-	<string name="poi_fuel_svo_yes">Huile Végétale Brute (HVB)</string>
+	<string name="poi_fuel:diesel">Gazole</string>
+	<string name="poi_fuel:gtl_diesel">Gazole liquéfié</string>
+	<string name="poi_fuel:hgv_diesel">Gazole poids lourds</string>
+	<string name="poi_fuel:biodiesel">Bio-gazole</string>
+	<string name="poi_fuel:lpg">GPL</string>
+	<string name="poi_fuel:cng">Gaz naturel compressé</string>
+	<string name="poi_fuel:1_25">Carburant 1:25</string>
+	<string name="poi_fuel:1_50">Carburant 1:50</string>
+	<string name="poi_fuel:svo">Huile Végétale Brute (HVB)</string>
 	<string name="poi_junction">Carrefour</string>
 	<string name="poi_forest">Sylviculture</string>
 	<string name="poi_landuse_railway">Zone de chemins de fer</string>
 
 	<string name="poi_village_green">Village vert</string>
 
+	<string name="poi_sailing">Navigation à voile</string>
+	<string name="poi_charity">Boutique de charité</string>
+	<string name="poi_tomb">Sépulture</string>
 	</resources>
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index 0ffd28b322..6058e66edd 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -17,7 +17,7 @@
 	<string name="poi_art">Tenda de arte</string>
 	<string name="poi_boutique">Tenda de moda</string>
 	<string name="poi_carpet">Tenda de alfombras</string>
-	<string name="poi_children_clothes">Roupa infantil</string>
+	<string name="poi_child_clothes">Roupa infantil</string>
 	<string name="poi_shoes">Zapataría</string>
 	<string name="poi_computer">Tenda de informática</string>
 	<string name="poi_copyshop">Copistaría</string>
@@ -48,7 +48,7 @@
 	<string name="poi_vacuum_cleaner">Tenda de aspiradoras</string>
 	<string name="poi_department_store">Grandes almacéns</string>
 	<string name="poi_electronics">Tenda de electrónica</string>
-	<string name="poi_car_parts_shop">Recambios de automóbil</string>
+	<string name="poi_car_parts">Recambios de automóbil</string>
 	<string name="poi_atv">Tenda de quads</string>
 	<string name="poi_cosmetics">Cosméticos</string>
 	<string name="poi_marketplace">Mercado</string>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index af5313a234..f7aa895538 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -7,7 +7,7 @@
 	<string name="poi_beverages">Italbolt</string>
 	<string name="poi_butcher">Hentes</string>
 	<string name="poi_deli">Delikatesz bolt</string>
-	<string name="poi_shop_farm">Farm bolt</string>
+	<string name="poi_farm">Farm bolt</string>
 	<string name="poi_greengrocer">Zöldséges</string>
 	<string name="poi_seafood">Halárus</string>
 	<string name="poi_confectionery">Cukrászda</string>
@@ -35,8 +35,8 @@
 	<string name="poi_toys">Játékbolt</string>
 	<string name="poi_variety_store">100 forintos bolt</string>
 	<string name="poi_department_store">Áruház</string>
-	<string name="poi_car_shop">Autókereskedés</string>
-	<string name="poi_car_parts_shop">Autóalkatrész</string>
+	<string name="poi_car">Autókereskedés</string>
+	<string name="poi_car_parts">Autóalkatrész</string>
 	<string name="poi_marketplace">Piac</string>
 	<string name="poi_police">Rendőrség</string>
 	<string name="poi_fire_station">Tűzoltóság</string>
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index a25fa9bacd..1938c8c7b2 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -14,7 +14,7 @@
 	<string name="poi_beverages">Negozio di bevande</string>
 	<string name="poi_butcher">Macelleria</string>
 	<string name="poi_deli">Gastronomia</string>
-	<string name="poi_shop_farm">Vendita prodotti di fattoria</string>
+	<string name="poi_farm">Vendita prodotti di fattoria</string>
 	<string name="poi_greengrocer">Fruttivendolo</string>
 	<string name="poi_confectionery">Negozio di dolciumi</string>
 	<string name="poi_ice_cream">Gelateria</string>
@@ -29,7 +29,7 @@
 	<string name="poi_carpet">Negozio tappeti</string>
 	<string name="poi_chemist">Farmacia</string>
 	<string name="poi_clothes">Abbigliamento</string>
-	<string name="poi_children_clothes">Abbigliamento bambini</string>
+	<string name="poi_child_clothes">Abbigliamento bambini</string>
 	<string name="poi_shoes">Negozio calzature</string>
 	<string name="poi_computer">Negozio di computer</string>
 	<string name="poi_copyshop">Copisteria</string>
@@ -114,8 +114,8 @@
 	<string name="poi_window_blind">Negozio finestre cieche</string>
 	<string name="poi_department_store">Grande magazzino</string>
 	<string name="poi_electronics">Negozio elettronica</string>
-	<string name="poi_car_shop">Autosalone</string>
-	<string name="poi_car_parts_shop">Autoricambi</string>
+	<string name="poi_car">Autosalone</string>
+	<string name="poi_car_parts">Autoricambi</string>
 	<string name="poi_atv">Negozio quad</string>
 	<string name="poi_cosmetics">Negozio cosmetici</string>
 	<string name="poi_marketplace">Mercato</string>
@@ -535,7 +535,7 @@
 	<string name="poi_paddle_tennis">Paddle tennis</string>
 	<string name="poi_surfing">Surf</string>
 	<string name="poi_artwork">Opera d\'arte</string>
-	<string name="poi_cannon">Cannone storico</string>
+	<string name="poi_historic_cannon">Cannone storico</string>
 	<string name="poi_attraction_big_wheel">Ruota panoramica</string>
 	<string name="poi_attraction_carousel">Giostra</string>
 	<string name="poi_attraction_maze">Labirinto</string>
diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml
index 472f3b66ba..55ce53f97a 100644
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@@ -260,29 +260,29 @@
 	<string name="poi_power_generator">発電機(Power generator)</string>
 
 	<string name="poi_landuse">土地利用(Landuse)</string>
-	<string name="poi_fuel_diesel_yes">ディーゼル(Diesel)</string>
-	<string name="poi_fuel_gtl_diesel_yes">GTLディーゼル(GTL diesel)</string>
-	<string name="poi_fuel_hgv_diesel_yes">HGVディーゼル(HGV diesel)</string>
-	<string name="poi_fuel_biodiesel_yes">バイオディーゼル(Bio diesel)</string>
-	<string name="poi_fuel_lpg_yes">液化石油ガス</string>
-	<string name="poi_fuel_octane_80_yes">オクタン価80(Octane 80)</string>
-	<string name="poi_fuel_octane_91_yes">オクタン価91(Octane 91)</string>
-	<string name="poi_fuel_octane_92_yes">オクタン価92(Octane 92)</string>
-	<string name="poi_fuel_octane_95_yes">オクタン価95(Octane 95)</string>
-	<string name="poi_fuel_octane_98_yes">オクタン価98(Octane 98)</string>
-	<string name="poi_fuel_octane_100_yes">オクタン価100(Octane 100)</string>
-	<string name="poi_fuel_cng_yes">圧縮天然ガス</string>
-	<string name="poi_fuel_1_25_yes">混合油 1:25(1:25 fuel)</string>
-	<string name="poi_fuel_1_50_yes">混合油 1:50(1:50 fuel)</string>
-	<string name="poi_fuel_ethanol_yes">エタノール(Ethanol)</string>
-	<string name="poi_fuel_methanol_yes">メタノール(Methanol)</string>
-	<string name="poi_fuel_svo_yes">植物油(SVO)</string>
-	<string name="poi_fuel_e10_yes">E10・バイオエタノール10％混合ガソリン(E10)</string>
-	<string name="poi_fuel_e20_yes">E20・バイオエタノール20％混合ガソリン(E20)</string>
-	<string name="poi_fuel_e85_yes">E85・バイオエタノール85％混合ガソリン(E85)</string>
-	<string name="poi_fuel_biogas_yes">E85・バイオエタノール85％混合ガソリン(E85)</string>
-	<string name="poi_fuel_LH2_yes">液体水素(Liquid hydrogen)</string>
-	<string name="poi_fuel_electricity_yes">電気(Electricity)</string>
+	<string name="poi_fuel:diesel">ディーゼル(Diesel)</string>
+	<string name="poi_fuel:gtl_diesel">GTLディーゼル(GTL diesel)</string>
+	<string name="poi_fuel:hgv_diesel">HGVディーゼル(HGV diesel)</string>
+	<string name="poi_fuel:biodiesel">バイオディーゼル(Bio diesel)</string>
+	<string name="poi_fuel:lpg">液化石油ガス</string>
+	<string name="poi_fuel:octane_80">オクタン価80(Octane 80)</string>
+	<string name="poi_fuel:octane_91">オクタン価91(Octane 91)</string>
+	<string name="poi_fuel:octane_92">オクタン価92(Octane 92)</string>
+	<string name="poi_fuel:octane_95">オクタン価95(Octane 95)</string>
+	<string name="poi_fuel:octane_98">オクタン価98(Octane 98)</string>
+	<string name="poi_fuel:octane_100">オクタン価100(Octane 100)</string>
+	<string name="poi_fuel:cng">圧縮天然ガス</string>
+	<string name="poi_fuel:1_25">混合油 1:25(1:25 fuel)</string>
+	<string name="poi_fuel:1_50">混合油 1:50(1:50 fuel)</string>
+	<string name="poi_fuel:ethanol">エタノール(Ethanol)</string>
+	<string name="poi_fuel:methanol">メタノール(Methanol)</string>
+	<string name="poi_fuel:svo">植物油(SVO)</string>
+	<string name="poi_fuel:e10">E10・バイオエタノール10％混合ガソリン(E10)</string>
+	<string name="poi_fuel:e20">E20・バイオエタノール20％混合ガソリン(E20)</string>
+	<string name="poi_fuel:e85">E85・バイオエタノール85％混合ガソリン(E85)</string>
+	<string name="poi_fuel:biogas">E85・バイオエタノール85％混合ガソリン(E85)</string>
+	<string name="poi_fuel:lh2">液体水素(Liquid hydrogen)</string>
+	<string name="poi_fuel:electricity">電気(Electricity)</string>
 	<string name="poi_junction">ジャンクション(Junction)</string>
 	<string name="poi_rest_area">PA・SA(Rest area)</string>
 
@@ -441,4 +441,42 @@
 	<string name="poi_sport_multi">総合競技・複合競技(Multi sport)</string>
 	<string name="poi_orienteering">オリエンテーリング(Orienteering)</string>
 	<string name="poi_paddle_tennis">パドルテニス(Paddle tennis)</string>
+	<string name="poi_paragliding">パラグライダー(Paragliding)</string>
+	<string name="poi_pelota">球技総合(Pelota)</string>
+	<string name="poi_racquet">ラケット競技総合(Racquet)</string>
+	<string name="poi_roller_skating">ローラースケート(Roller skating)</string>
+	<string name="poi_rowing">ボート競技(Rowing)</string>
+	<string name="poi_rugby_union">ラグビーユニオン・ラグビー(Rugby union)</string>
+	<string name="poi_rugby_league">ラグビーリーグ・別種ラグビー(Rugby league)</string>
+	<string name="poi_shooting">射撃競技(Shooting)</string>
+	<string name="poi_skating">スケート・アイススケート(Skating)</string>
+	<string name="poi_skateboard">スケートボード・スケボー(Skateboard)</string>
+	<string name="poi_skiing">スキー(Skiing)</string>
+	<string name="poi_soccer">サッカー(Soccer)</string>
+	<string name="poi_surfing">サーフィン(Surfing)</string>
+	<string name="poi_swimming">水泳(Swimming)</string>
+	<string name="poi_table_tennis">卓球(Table tennis)</string>
+	<string name="poi_team_handball">チームハンドボール(曖昧につき使用非推奨・Team handball)</string>
+	<string name="poi_tennis">テニス(Tennis)</string>
+	<string name="poi_toboggan">トボガンぞり(Toboggan)</string>
+	<string name="poi_volleyball">バレーボール(Volleyball)</string>
+
+	<string name="poi_museum">博物館(Museum)</string>
+	<string name="poi_memorial">記念碑(Memorial)</string>
+	<string name="poi_artwork">芸術作品・アートワーク(Artwork)</string>
+	<string name="poi_archaeological_site">遺跡(Archaeological site)</string>
+	<string name="poi_battlefield">古戦場(Battlefield)</string>
+	<string name="poi_boundary_stone">境界標石(Boundary stone)</string>
+	<string name="poi_historic_cannon">歴史保存用大砲(Historic cannon)</string>
+	<string name="poi_castle">城(Castle)</string>
+	<string name="poi_city_gate">市壁・城壁門(City gate)</string>
+	<string name="poi_fort">砦(Fort)</string>
+	<string name="poi_fountain">噴水(Fountain)</string>
+	<string name="poi_historic_ruins">古跡・廃墟(Historic ruins)</string>
+	<string name="poi_rune_stone">ルーン石碑(Rune stone)</string>
+	<string name="poi_wreck">難破船・座礁船(Shipwreck)</string>
+	<string name="poi_historic_ship">退役船(Historic ship)</string>
+	<string name="poi_historic_mine">廃鉱山(Historic mine)</string>
+	<string name="poi_monument">モニュメント・記念碑(Monument)</string>
+	<string name="poi_aquarium">水族館(Aquarium)</string>
 	</resources>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index ff35c03a36..9ef1a380c1 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -8,7 +8,7 @@
 	<string name="poi_beverages">음료 가게</string>
 	<string name="poi_butcher">고기 시장</string>
 	<string name="poi_deli">델리</string>
-	<string name="poi_shop_farm">농장 가게</string>
+	<string name="poi_farm">농장 가게</string>
 	<string name="poi_greengrocer">그린그로서리</string>
 	<string name="poi_seafood">해산물 가게</string>
 	<string name="poi_confectionery">과자</string>
@@ -31,7 +31,7 @@
 	<string name="poi_carpet">카펫 가게</string>
 	<string name="poi_chemist">약국</string>
 	<string name="poi_clothes">의류 매장</string>
-	<string name="poi_children_clothes">어린이 의류</string>
+	<string name="poi_child_clothes">어린이 의류</string>
 	<string name="poi_shoes">신발 가게</string>
 	<string name="poi_computer">컴퓨터 가게</string>
 	<string name="poi_copyshop">복사 가게</string>
@@ -85,8 +85,8 @@
 	<string name="poi_window_blind">창문 블라인드 가게</string>
 	<string name="poi_department_store">백화점</string>
 	<string name="poi_electronics">전자 제품 매장</string>
-	<string name="poi_car_shop">자동차 판매소</string>
-	<string name="poi_car_parts_shop">자동차 부품</string>
+	<string name="poi_car">자동차 판매소</string>
+	<string name="poi_car_parts">자동차 부품</string>
 	<string name="poi_atv">쿼드 가게</string>
 	<string name="poi_cosmetics">화장품</string>
 	<string name="poi_marketplace">마켓 플레이스</string>
@@ -141,7 +141,6 @@
 	<string name="poi_bus_station">버스 정류장</string>
 	<string name="poi_railway_station">기차역</string>
 	<string name="poi_railway_platform">철도 플랫폼</string>
-	<string name="poi_railway_halt">철도 정류장 (사용 되지 않음)</string>
 	<string name="poi_railway_subway_entrance">지하철 입구</string>
 	<string name="poi_subway_station">지하철 역</string>
 	<string name="poi_taxi">택시 승차장</string>
@@ -510,7 +509,7 @@
 	<string name="poi_craft_rigger">리거</string>
 	<string name="poi_craft_saddler">새들러</string>
 	<string name="poi_craft_sailmaker">Sail 메이커</string>
-	<string name="poi_cannon">역사적인 대포</string>
+	<string name="poi_historic_cannon">역사적인 대포</string>
 	<string name="poi_harbour">항구</string>
 	<string name="poi_craft_sawmill">제재소</string>
 	<string name="poi_craft_scaffolder">스카프폴더</string>
@@ -665,13 +664,10 @@
 	<string name="poi_osmwiki">위키백과</string>
 	<string name="poi_user_defined_other">사용자 정의</string>
 	
-	<string name="poi_child_clothes">어린이 의류</string>
 	<string name="poi_apartment">아파트</string>
 
 	<string name="poi_military_landuse">군사 지역</string>
 	
-	<string name="poi_car">자동차 가게</string>
-	<string name="poi_car_parts">자동차 부품</string>
 	<string name="poi_public_transport_stop_position">대중 교통 정류장 위치</string>
 	<string name="poi_halt">철도 정거장</string>
 	<string name="poi_railway_buffer_stop">철도 버퍼 정거장</string>
@@ -682,7 +678,6 @@
 	<string name="poi_internet_access_public">인터넷 접속: 공용</string>
 	<string name="poi_internet_access_service">인터넷 접속: 서비스</string>
 	
-	<string name="poi_farm">농장 가게</string>
 	<string name="poi_wine">와인 삽</string>
 
 	<string name="poi_shop_food">식품점</string>
@@ -717,15 +712,15 @@
 	<string name="poi_silo">실로</string>
 	<string name="poi_storage_tank">저장 탱크</string>
 
-	<string name="piste_downhill">내리막</string>
-	<string name="piste_nordic">노르딕</string>
-	<string name="piste_skitour">스키여행</string>
-	<string name="piste_hike">하이킹</string>
-	<string name="piste_sleigh">썰매</string>
-	<string name="piste_sled">썰매</string>
-	<string name="piste_snow_park">스노우 파크</string>
-	<string name="piste_playground">놀이터</string>
-	<string name="piste_ice_skate">아이스 스케이트</string>
+	<string name="poi_piste_downhill">내리막</string>
+	<string name="poi_piste_nordic">노르딕</string>
+	<string name="poi_piste_skitour">스키여행</string>
+	<string name="poi_piste_hike">하이킹</string>
+	<string name="poi_piste_sleigh">썰매</string>
+	<string name="poi_piste_sled">썰매</string>
+	<string name="poi_piste_snow_park">스노우 파크</string>
+	<string name="poi_piste_playground">놀이터</string>
+	<string name="poi_piste_ice_skate">아이스 스케이트</string>
 
 	<string name="poi_allotments">부담금</string>
 	<string name="poi_forest">국립공원</string>
@@ -736,29 +731,29 @@
 	<string name="poi_water">수로</string>
 	<string name="poi_wood">나무</string>
 	<string name="poi_landuse">사유지</string>
-	<string name="poi_fuel_diesel_yes">디젤</string>
-	<string name="poi_fuel_gtl_diesel_yes">GTL 디젤</string>
-	<string name="poi_fuel_hgv_diesel_yes">HGV 디젤</string>
-	<string name="poi_fuel_biodiesel_yes">바이오 디젤</string>
-	<string name="poi_fuel_lpg_yes">LPG</string>
-	<string name="poi_fuel_octane_80_yes">옥탄가 80</string>
-	<string name="poi_fuel_octane_91_yes">옥탄가 91</string>
-	<string name="poi_fuel_octane_92_yes">옥탄가 92</string>
-	<string name="poi_fuel_octane_95_yes">옥탄가 95</string>
-	<string name="poi_fuel_octane_98_yes">옥탄가 98</string>
-	<string name="poi_fuel_octane_100_yes">옥탄가 100</string>
-	<string name="poi_fuel_cng_yes">압축천연가스(CNG)</string>
-	<string name="poi_fuel_1_25_yes">혼합유 1:25</string>
-	<string name="poi_fuel_1_50_yes">혼합유 1:50</string>
-	<string name="poi_fuel_ethanol_yes">에탄올</string>
-	<string name="poi_fuel_methanol_yes">메탄올</string>
-	<string name="poi_fuel_svo_yes">식물성 기름</string>
-	<string name="poi_fuel_e10_yes">E10</string>
-	<string name="poi_fuel_e20_yes">E20</string>
-	<string name="poi_fuel_e85_yes">E85</string>
-	<string name="poi_fuel_biogas_yes">E85</string>
-	<string name="poi_fuel_LH2_yes">액체 수소</string>
-	<string name="poi_fuel_electricity_yes">전기</string>
+	<string name="poi_fuel:diesel">디젤</string>
+	<string name="poi_fuel:gtl_diesel">GTL 디젤</string>
+	<string name="poi_fuel:hgv_diesel">HGV 디젤</string>
+	<string name="poi_fuel:biodiesel">바이오 디젤</string>
+	<string name="poi_fuel:lpg">LPG</string>
+	<string name="poi_fuel:octane_80">옥탄가 80</string>
+	<string name="poi_fuel:octane_91">옥탄가 91</string>
+	<string name="poi_fuel:octane_92">옥탄가 92</string>
+	<string name="poi_fuel:octane_95">옥탄가 95</string>
+	<string name="poi_fuel:octane_98">옥탄가 98</string>
+	<string name="poi_fuel:octane_100">옥탄가 100</string>
+	<string name="poi_fuel:cng">압축천연가스(CNG)</string>
+	<string name="poi_fuel:1_25">혼합유 1:25</string>
+	<string name="poi_fuel:1_50">혼합유 1:50</string>
+	<string name="poi_fuel:ethanol">에탄올</string>
+	<string name="poi_fuel:methanol">메탄올</string>
+	<string name="poi_fuel:svo">식물성 기름</string>
+	<string name="poi_fuel:e10">E10</string>
+	<string name="poi_fuel:e20">E20</string>
+	<string name="poi_fuel:e85">E85</string>
+	<string name="poi_fuel:biogas">E85</string>
+	<string name="poi_fuel:lh2">액체 수소</string>
+	<string name="poi_fuel:electricity">전기</string>
 	<string name="poi_junction">접합</string>
 	<string name="poi_industrial">산업 분야</string>
 	<string name="poi_farmyard">농장 구내</string>
@@ -770,4 +765,7 @@
 	<string name="poi_recreation_ground">레크리에이션 지역</string>
 	<string name="poi_village_green">녹색 마을</string>
 
+	<string name="poi_charity">자선 가게</string>
+	<string name="poi_photo">사진관</string>
+	<string name="poi_sailing">항해</string>
 	</resources>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index 8c685e1cba..c60c15b591 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -9,7 +9,7 @@
 	<string name="poi_beverages">Drankwinkel</string>
 	<string name="poi_butcher">Vleesmarkt</string>
 	<string name="poi_deli">Delicatessenwinkel</string>
-	<string name="poi_shop_farm">Boerderijwinkel</string>
+	<string name="poi_farm">Boerderijwinkel</string>
 	<string name="poi_greengrocer">Groentewinkel</string>
 	<string name="poi_seafood">Viswinkel</string>
 	<string name="poi_confectionery">Banketbakkerij</string>
@@ -33,7 +33,7 @@
 	<string name="poi_carpet">Tapijtwinkel</string>
 	<string name="poi_chemist">Drogisterij</string>
 	<string name="poi_clothes">Kledingwinkel</string>
-	<string name="poi_children_clothes">Kinderkledingwinkel</string>
+	<string name="poi_child_clothes">Kinderkledingwinkel</string>
 	<string name="poi_shoes">Schoenenwinkel</string>
 	<string name="poi_computer">Computerwinkel</string>
 	<string name="poi_copyshop">Kopieerzaak</string>
@@ -87,8 +87,8 @@
 	<string name="poi_window_blind">Rolluikenwinkel</string>
 	<string name="poi_department_store">Warenhuis</string>
 	<string name="poi_electronics">Elektronica-winkel</string>
-	<string name="poi_car_shop">Autohandelaar</string>
-	<string name="poi_car_parts_shop">Auto-onderdelenwinkel</string>
+	<string name="poi_car">Autohandelaar</string>
+	<string name="poi_car_parts">Auto-onderdelenwinkel</string>
 	<string name="poi_atv">Quad-winkel</string>
 	<string name="poi_cosmetics">Cosmeticazaak</string>
 	<string name="poi_marketplace">Marktplaats</string>
@@ -135,7 +135,6 @@
 	<string name="poi_bus_station">Busstation</string>
 	<string name="poi_railway_station">Treinstation</string>
 	<string name="poi_railway_platform">Perron</string>
-	<string name="poi_railway_halt">Treinhalte (verouderd)</string>
 	<string name="poi_railway_subway_entrance">Metro-ingang</string>
 	<string name="poi_subway_station">Metrostation</string>
 	<string name="poi_taxi">Taxistandplaats</string>
@@ -223,7 +222,7 @@
 	<string name="poi_memorial">Gedenkteken</string>
 	<string name="poi_archaeological_site">Archeologische site</string>
 	<string name="poi_battlefield">Slagveld</string>
-	<string name="poi_cannon">Historisch kanon</string>
+	<string name="poi_historic_cannon">Historisch kanon</string>
 	<string name="poi_castle">Kasteel</string>
 	<string name="poi_city_gate">Stadspoort</string>
 	<string name="poi_fort">Fort</string>
@@ -557,12 +556,8 @@
 	<string name="poi_osmwiki">Wikipedia</string>
 	<string name="poi_user_defined_other">door de gebruiker gedefinieerd</string>
 	
-	<string name="poi_farm">Boerderijwinkel</string>
 	<string name="poi_wine">Wijnhandel</string>
 
-	<string name="poi_child_clothes">Kinderkleding</string>
-	<string name="poi_car">Auto dealer</string>
-	<string name="poi_car_parts">Auto onderdelen</string>
 	<string name="poi_public_transport_stop_position">Halte openbaar vervoer</string>
 	<string name="poi_halt">Station</string>
 	<string name="poi_railway_buffer_stop">Spoor stootblok</string>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index e9983dc38e..7106ce5eac 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -6,7 +6,7 @@
 	<string name="poi_beverages">Napoje</string>
 	<string name="poi_butcher">Sklep mięsny</string>
 	<string name="poi_deli">Delikatesy</string>
-	<string name="poi_shop_farm">Produkty rolne</string>
+	<string name="poi_farm">Produkty rolne</string>
 	<string name="poi_greengrocer">Warzywniak</string>
 	<string name="poi_seafood">Owoce morza</string>
 	<string name="poi_confectionery">Cukiernia</string>
@@ -31,7 +31,7 @@
 	<string name="poi_carpet">Sklep z dywanami</string>
 	<string name="poi_chemist">Sklep z narkotykami</string>
 	<string name="poi_clothes">Sklep odzieżowy</string>
-	<string name="poi_children_clothes">Sklep odzieżowy dla dzieci</string>
+	<string name="poi_child_clothes">Sklep odzieżowy dla dzieci</string>
 	<string name="poi_shoes">Sklep obuwniczy</string>
 	<string name="poi_computer">Sklep komputerowy</string>
 	<string name="poi_curtain">Sklep z zasłonami</string>
@@ -85,8 +85,8 @@
 	<string name="poi_window_blind">Zasłony</string>
 	<string name="poi_department_store">Dom handlowy</string>
 	<string name="poi_electronics">RTV</string>
-	<string name="poi_car_shop">Motoryzacyjny</string>
-	<string name="poi_car_parts_shop">Części samochodowe</string>
+	<string name="poi_car">Motoryzacyjny</string>
+	<string name="poi_car_parts">Części samochodowe</string>
 	<string name="poi_atv">Quady</string>
 	<string name="poi_cosmetics">Kosmetyki</string>
 	<string name="poi_marketplace">Bazar</string>
@@ -178,7 +178,6 @@
 	<string name="poi_speed_camera">Fotoradar</string>
 	<string name="poi_emergency_access_point">Ambulatoryjne świadczenia zdrowotne</string>
 
-	<string name="poi_railway_halt">Dworzec kolejowy (nieaktualne)</string>
 	<string name="poi_turning_circle">Miejsce do zawracania</string>
 	<string name="poi_motorway_junction">Zjazd z autostrady</string>
 
@@ -320,7 +319,7 @@
 	<string name="poi_memorial">Pomnik</string>
 	<string name="poi_archaeological_site">Wykopalisko archeologiczne</string>
 	<string name="poi_boundary_stone">Kamień graniczny</string>
-	<string name="poi_cannon">Historyczne armaty</string>
+	<string name="poi_historic_cannon">Historyczne armaty</string>
 	<string name="poi_castle">Zamek</string>
 	<string name="poi_city_gate">Brama miasta</string>
 	<string name="poi_fort">Fort</string>
@@ -472,8 +471,6 @@
 	
 	<string name="poi_wine">Sklep z winami</string>
 
-	<string name="poi_child_clothes">Odzież dla dzieci</string>
-	<string name="poi_car_parts">Części samochodowe</string>
 	<string name="poi_recycling">Recykling</string>
 	<string name="poi_pharmacy">Apteka</string>
 	<string name="poi_first_aid">Pierwsza pomoc</string>
@@ -501,7 +498,6 @@
 		<string name="poi_office">Biuro</string>
 	<string name="poi_sightseeing">Zwiedzanie</string>
 		<string name="poi_internet_access">Dostęp do Internetu</string>
-	<string name="poi_farm">Sklep rolniczy</string>
 	<string name="poi_military_nuclear_explosion_site">Miejsce eksplozji jądrowej</string>
 <string name="poi_military_naval_base">Wojskowa baza morska</string>
 	<string name="poi_military_danger_area">Strefa zagrożenia</string>
@@ -509,10 +505,9 @@
 	<string name="poi_accomodation">Noclegi</string>
 		<string name="poi_club">Klub</string>
 	<string name="poi_cafe_and_restaurant">Kawiarnia i restauracja</string>
-	<string name="poi_car">Sklep motoryzacyjny</string>
-	<string name="poi_fuel_biodiesel_yes">Biodiesel</string>
-	<string name="poi_fuel_lpg_yes">LPG</string>
-	<string name="poi_fuel_cng_yes">CNG</string>
+	<string name="poi_fuel:biodiesel">Biodiesel</string>
+	<string name="poi_fuel:lpg">LPG</string>
+	<string name="poi_fuel:cng">CNG</string>
 	<string name="poi_public_transport_stop_position">"Przystanek transpoertu  publicznego"</string>
 	<string name="poi_halt">Przystanek kolejowy</string>
 	<string name="poi_rest_area">Miejsce odpoczynku</string>
@@ -525,26 +520,26 @@
 		<string name="poi_craft">Rzemieślnik</string>
 	<string name="poi_seamark">Wodny</string>
 	<string name="poi_medical_supply">Artykuły medyczne</string>
-	<string name="poi_fuel_diesel_yes">Olej napędowy</string>
-	<string name="poi_fuel_gtl_diesel_yes">Modyfikowany olej napędowy</string>
-	<string name="poi_fuel_hgv_diesel_yes">Ulepszony olej napędowy</string>
-	<string name="poi_fuel_octane_80_yes">Benzyna 80 oktanów</string>
-	<string name="poi_fuel_octane_91_yes">Benzyna 91 oktanów</string>
-	<string name="poi_fuel_octane_92_yes">Benzyna 92 oktany</string>
-	<string name="poi_fuel_octane_95_yes">Benzyna 95 oktanów</string>
-	<string name="poi_fuel_octane_98_yes">Benzyna 98 oktanów</string>
-	<string name="poi_fuel_octane_100_yes">Benzyna 100 oktanów</string>
-	<string name="poi_fuel_1_25_yes">Paliwo 1:25</string>
-	<string name="poi_fuel_1_50_yes">Paliwo 1:50</string>
-	<string name="poi_fuel_ethanol_yes">Paliwo: etanol</string>
-	<string name="poi_fuel_methanol_yes">Paliwo: metanol</string>
-	<string name="poi_fuel_svo_yes">Paliwo: SVO (olej roślinny)</string>
-	<string name="poi_fuel_e10_yes">Paliwo: E10</string>
-	<string name="poi_fuel_e20_yes">Paliwo: E20</string>
-	<string name="poi_fuel_e85_yes">Paliwo: E85</string>
-	<string name="poi_fuel_biogas_yes">Paliwo: biogaz</string>
-	<string name="poi_fuel_LH2_yes">Paliwo: ciekły wodór</string>
-	<string name="poi_fuel_electricity_yes">Paliwo: elektryczność</string>
+	<string name="poi_fuel:diesel">Olej napędowy</string>
+	<string name="poi_fuel:gtl_diesel">Modyfikowany olej napędowy</string>
+	<string name="poi_fuel:hgv_diesel">Ulepszony olej napędowy</string>
+	<string name="poi_fuel:octane_80">Benzyna 80 oktanów</string>
+	<string name="poi_fuel:octane_91">Benzyna 91 oktanów</string>
+	<string name="poi_fuel:octane_92">Benzyna 92 oktany</string>
+	<string name="poi_fuel:octane_95">Benzyna 95 oktanów</string>
+	<string name="poi_fuel:octane_98">Benzyna 98 oktanów</string>
+	<string name="poi_fuel:octane_100">Benzyna 100 oktanów</string>
+	<string name="poi_fuel:1_25">Paliwo 1:25</string>
+	<string name="poi_fuel:1_50">Paliwo 1:50</string>
+	<string name="poi_fuel:ethanol">Paliwo: etanol</string>
+	<string name="poi_fuel:methanol">Paliwo: metanol</string>
+	<string name="poi_fuel:svo">Paliwo: SVO (olej roślinny)</string>
+	<string name="poi_fuel:e10">Paliwo: E10</string>
+	<string name="poi_fuel:e20">Paliwo: E20</string>
+	<string name="poi_fuel:e85">Paliwo: E85</string>
+	<string name="poi_fuel:biogas">Paliwo: biogaz</string>
+	<string name="poi_fuel:lh2">Paliwo: ciekły wodór</string>
+	<string name="poi_fuel:electricity">Paliwo: elektryczność</string>
 	<string name="poi_railway_buffer_stop">Ogranicznik kolejowy</string>
 	<string name="poi_junction">Skrzyżowanie</string>
 	<string name="poi_lock_gate">Zamknięta brama</string>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 3bb37cc848..81051d6f29 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -7,7 +7,6 @@
 	<string name="poi_beverages">Напитки</string>
 	<string name="poi_butcher">Мясная лавка</string>
 	<string name="poi_deli">Деликатесы</string>
-	<string name="poi_shop_farm">Фермерские продукты</string>
 	<string name="poi_greengrocer">Овощи и фрукты</string>
 	<string name="poi_seafood">Морепродукты</string>
 	<string name="poi_confectionery">Кондитерская</string>
@@ -28,10 +27,10 @@
 	<string name="poi_bed">Спальные принадлежности</string>
 	<string name="poi_boutique">Бутик</string>
 	<string name="poi_carpet">Магазин ковров</string>
-	<string name="poi_charity_shop">Благотворительный магазин</string>
+	<string name="poi_charity">Благотворительный магазин</string>
 	<string name="poi_chemist">Бытовая химия, косметика</string>
 	<string name="poi_clothes">Одежда</string>
-	<string name="poi_children_clothes">Детская одежда</string>
+	<string name="poi_child_clothes">Детская одежда</string>
 	<string name="poi_shoes">Обувь</string>
 	<string name="poi_computer">Компьютеры</string>
 	<string name="poi_copyshop">Ксерокопия, полиграфия</string>
@@ -85,8 +84,8 @@
 	<string name="poi_window_blind">Жалюзи, ставни, маркизы</string>
 	<string name="poi_department_store">Универмаг</string>
 	<string name="poi_electronics">Электроника</string>
-	<string name="poi_car_shop">Автосалон</string>
-	<string name="poi_car_parts_shop">Автозапчасти</string>
+	<string name="poi_car">Автосалон</string>
+	<string name="poi_car_parts">Автозапчасти</string>
 	<string name="poi_atv">Квадроциклы</string>
 	<string name="poi_cosmetics">Косметика, парфюмерия</string>
 	<string name="poi_marketplace">Рынок</string>
@@ -144,7 +143,6 @@
 	<string name="poi_bus_station">Автобусная станция</string>
 	<string name="poi_railway_station">Ж/д станция</string>
 	<string name="poi_railway_platform">Ж/д платформа</string>
-	<string name="poi_railway_halt">Ж/д платформа</string>
 	<string name="poi_railway_subway_entrance">Вход в метро</string>
 	<string name="poi_subway_station">Станция метро</string>
 	<string name="poi_taxi">Стоянка такси</string>
@@ -620,7 +618,7 @@
 	<string name="poi_bmx">Веломотокросс</string>
 	<string name="poi_canadian_football">Канадский футбол</string>
 	<string name="poi_surfing">Серфинг</string>
-	<string name="poi_cannon">Исторические пушки</string>
+	<string name="poi_historic_cannon">Исторические пушки</string>
 	<string name="poi_harbour">Гавань</string>
 	<string name="poi_attraction_big_wheel">Колесо обозрения</string>
 	<string name="poi_attraction_carousel">Карусель</string>
@@ -655,8 +653,6 @@
 	<string name="poi_entertainment">Досуг</string>
 	<string name="poi_wine">Винный магазин</string>
 
-	<string name="poi_car">Автомобильный магазин</string>
-	<string name="poi_car_parts">Автозапчасти</string>
 	<string name="poi_halt">Железнодорожная остановка</string>
 	<string name="poi_emergency">Экстренные службы</string>
 	<string name="poi_transportation">Транспорт</string>
@@ -690,7 +686,6 @@
 		<string name="poi_communication">Коммуникации</string>
 		<string name="poi_trash_disposal">Утилизация мусора</string>
 	<string name="poi_accomodation">Проживание</string>
-		<string name="poi_child_clothes">Детская одежда</string>
 	<string name="poi_training">Учебный центр</string>
 	<string name="poi_quarter">Квартал</string>
 	<string name="poi_field_hockey">Хоккейная площадка</string>
@@ -702,19 +697,19 @@
 	<string name="poi_silo">Силос</string>
 	<string name="poi_apartment">Квартира</string>
 
-	<string name="piste_skitour">Скитур</string>
-	<string name="piste_sleigh"/>
-	<string name="piste_playground">Игровая площадка</string>
+	<string name="poi_piste_skitour">Скитур</string>
+	<string name="poi_piste_sleigh"/>
+	<string name="poi_piste_playground">Игровая площадка</string>
 	<string name="poi_smoking_area">Место для курения</string>
 	<string name="poi_canal">Канал</string>
 	<string name="poi_water">Вода</string>
 	<string name="poi_wood">Лес</string>
 	<string name="poi_valley">Долина</string>
 	<string name="poi_bench">Скамейка</string>
-	<string name="piste_ice_skate">Ледовый каток</string>
+	<string name="poi_piste_ice_skate">Ледовый каток</string>
 
-	<string name="piste_snow_park">Снежный парк</string>
-	<string name="poi_fuel_diesel_yes">Дизель</string>
-	<string name="poi_fuel_ethanol_yes">Этанол</string>
-	<string name="poi_fuel_methanol_yes">Метанол</string>
+	<string name="poi_piste_snow_park">Снежный парк</string>
+	<string name="poi_fuel:diesel">Дизель</string>
+	<string name="poi_fuel:ethanol">Этанол</string>
+	<string name="poi_fuel:methanol">Метанол</string>
 	</resources>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index b7057f83d7..87a7898d80 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -8,7 +8,7 @@
 	<string name="poi_beverages">Butega de bèvidas</string>
 	<string name="poi_butcher">Bancu</string>
 	<string name="poi_deli">Gastronomia</string>
-	<string name="poi_shop_farm">Butega prodotos de fatoria</string>
+	<string name="poi_farm">Butega prodotos de fatoria</string>
 	<string name="poi_greengrocer">Bendidore de frùtora</string>
 	<string name="poi_seafood">Pischeria</string>
 	<string name="poi_confectionery">Butega de durches</string>
@@ -31,7 +31,7 @@
 	<string name="poi_carpet">Butega de tapetes</string>
 	<string name="poi_chemist">Potecaria</string>
 	<string name="poi_clothes">Bestimenta</string>
-	<string name="poi_children_clothes">Bestimenta pro pitzinnos</string>
+	<string name="poi_child_clothes">Bestimenta pro pitzinnos</string>
 	<string name="poi_shoes">Butega de iscarpas</string>
 	<string name="poi_computer">Butega de informàtica</string>
 	<string name="poi_copyshop">Copisteria</string>
@@ -78,8 +78,8 @@
 	<string name="poi_vacuum_cleaner">Butega de suspidoras</string>
 	<string name="poi_video">Videonolègiu</string>
 	<string name="poi_electronics">Butega de eletrònica</string>
-	<string name="poi_car_shop">Butega de automòbiles</string>
-	<string name="poi_car_parts_shop">Autoricàmbios</string>
+	<string name="poi_car">Butega de automòbiles</string>
+	<string name="poi_car_parts">Autoricàmbios</string>
 	<string name="poi_atv">Butega de quad</string>
 	<string name="poi_cosmetics">Butega de bellettos</string>
 	<string name="poi_marketplace">Mercadu</string>
@@ -120,7 +120,6 @@
 	<string name="poi_bus_station">Istatzione bus</string>
 	<string name="poi_railway_station">Istatzione de sos trenos</string>
 	<string name="poi_railway_platform">Piattaredda ferroviària</string>
-	<string name="poi_railway_halt">Firmada de sos trenos (disusada)</string>
 	<string name="poi_railway_subway_entrance">Intrada de sa metropolitana</string>
 	<string name="poi_subway_station">Istatzione de sa metropolitana</string>
 	<string name="poi_taxi">Postèggiu de sos taxi</string>
@@ -574,7 +573,7 @@
 
 	<string name="poi_waterway_turning_point">Furriada de martza pro naviles</string>
 	<string name="poi_customs">Dogana</string>
-	<string name="poi_cannon">Cannone istòricu</string>
+	<string name="poi_historic_cannon">Cannone istòricu</string>
 	<string name="poi_attraction_big_wheel">Roda panoràmica</string>
 	<string name="poi_attraction_carousel">Giostra</string>
 	<string name="poi_attraction_maze">Labirintu</string>
@@ -617,12 +616,8 @@
 	<string name="poi_internet_access_public">Atzessu ìnternet: pùblicu</string>
 	<string name="poi_internet_access_service">Atzessu ìnternet: servìtziu</string>
 	
-	<string name="poi_farm">Fatoria: butega</string>
 	<string name="poi_wine">Butega de binos</string>
 
-	<string name="poi_child_clothes">Butega de bestires pro pitzinnos</string>
-	<string name="poi_car">Cuntzessionàriu de màchinas</string>
-	<string name="poi_car_parts">Cantos de màchinas</string>
 	<string name="poi_public_transport_stop_position">Firmada de su trasportu pùblicu</string>
 	<string name="poi_halt">Firmada de sa ferrovia</string>
 	<string name="poi_railway_buffer_stop">Denegante pro sos trenos</string>
@@ -647,6 +642,6 @@
 	<string name="poi_road_obstacle">Impèigu/ostàculu istradale</string>
 		<string name="poi_accomodation">Allògiu</string>
 		<string name="poi_smoking_area">Àrea fumatores</string>
-	<string name="piste_playground">Parcu giogos</string>
+	<string name="poi_piste_playground">Parcu giogos</string>
 	<string name="poi_car_sharing"></string>
 	</resources>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 1b709a4085..f48ad875e2 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -318,7 +318,7 @@
 	<string name="poi_archaeological_site">Archeologické nálezisko</string>
 	<string name="poi_battlefield">Bojisko</string>
 	<string name="poi_boundary_stone">Hraničný kameň</string>
-	<string name="poi_cannon">Delo</string>
+	<string name="poi_historic_cannon">Delo</string>
 	<string name="poi_castle">Hrad</string>
 	<string name="poi_city_gate">Mestská brána</string>
 	<string name="poi_fort">Pevnosť</string>
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index 51a6362642..7302531cdf 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -8,7 +8,7 @@
 	<string name="poi_beverages">Напої</string>
 	<string name="poi_butcher">М’ясо</string>
 	<string name="poi_deli">Делікатеси</string>
-	<string name="poi_shop_farm">Продукти з села</string>
+	<string name="poi_farm">Продукти з села</string>
 	<string name="poi_greengrocer">Овочі, фрукти</string>
 	<string name="poi_seafood">Морепродукти</string>
 	<string name="poi_confectionery">Кондитерські вироби</string>
@@ -31,7 +31,7 @@
 	<string name="poi_carpet">Килими</string>
 	<string name="poi_chemist">Аптека</string>
 	<string name="poi_clothes">Магазин одягу</string>
-	<string name="poi_children_clothes">Дитячий одяг</string>
+	<string name="poi_child_clothes">Дитячий одяг</string>
 	<string name="poi_shoes">Магазин взуття</string>
 	<string name="poi_computer">Комп’ютерний магазин</string>
 	<string name="poi_copyshop">Копіювальні послуги, полігрфафія</string>
@@ -85,8 +85,8 @@
 	<string name="poi_window_blind">Жалюзі, віконниці, маркізи</string>
 	<string name="poi_department_store">Универмаг</string>
 	<string name="poi_electronics">Електороніка</string>
-	<string name="poi_car_shop">Автосалон</string>
-	<string name="poi_car_parts_shop">Автозапчастини</string>
+	<string name="poi_car">Автосалон</string>
+	<string name="poi_car_parts">Автозапчастини</string>
 	<string name="poi_atv">Квадроцикли</string>
 	<string name="poi_cosmetics">Косметика</string>
 	<string name="poi_marketplace">Ринок</string>
@@ -131,6 +131,4 @@
 	<string name="poi_osmwiki">Вікіпедія</string>
 	<string name="poi_user_defined_other">Визначено користувачем</string>
 	
-	<string name="poi_child_clothes">Дитячий одяг</string>
-	<string name="poi_car_parts">Автозапчастини</string>
 	</resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 8575839681..fde0f5cce3 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -73,6 +73,7 @@
 	<string name="poi_bed">Bed room furnishings</string>
 	<string name="poi_boutique">Fashion boutique</string>
 	<string name="poi_carpet">Carpet shop</string>
+	<string name="poi_charity">Charity shop</string>
 	<string name="poi_chemist">Drug store</string>
 	<string name="poi_clothes">Apparel store</string>
 	<string name="poi_child_clothes">Childrens apparel</string>
@@ -114,6 +115,7 @@
 	<string name="poi_outdoor">Outdoor store</string>
 	<string name="poi_paint">Paint shop</string>
 	<string name="poi_pet">Pet shop</string>
+	<string name="poi_photo">Photo shop</string>
 	<string name="poi_radiotechnics">Radiotechnics store</string>
 	<string name="poi_second_hand">Second hand store</string>
 	<string name="poi_ship_chandler">Ship chandler</string>
@@ -171,29 +173,29 @@
 	<string name="poi_vehicle_inspection">Vehicle inspection</string>
 	<string name="poi_car_wash">Car wash</string>
 	<string name="poi_fuel">Gas station</string>
-	<string name="poi_fuel_diesel_yes">Diesel</string>
-	<string name="poi_fuel_gtl_diesel_yes">GTL diesel</string>
-	<string name="poi_fuel_hgv_diesel_yes">HGV diesel</string>
-	<string name="poi_fuel_biodiesel_yes">Bio diesel</string>
-	<string name="poi_fuel_lpg_yes">LPG</string>
-	<string name="poi_fuel_octane_80_yes">Octane 80</string>
-	<string name="poi_fuel_octane_91_yes">Octane 91</string>
-	<string name="poi_fuel_octane_92_yes">Octane 92</string>
-	<string name="poi_fuel_octane_95_yes">Octane 95</string>
-	<string name="poi_fuel_octane_98_yes">Octane 98</string>
-	<string name="poi_fuel_octane_100_yes">Octane 100</string>
-	<string name="poi_fuel_cng_yes">CNG</string>
-	<string name="poi_fuel_1_25_yes">1:25 fuel</string>
-	<string name="poi_fuel_1_50_yes">1:50 fuel</string>
-	<string name="poi_fuel_ethanol_yes">Ethanol</string>
-	<string name="poi_fuel_methanol_yes">Methanol</string>
-	<string name="poi_fuel_svo_yes">SVO</string>
-	<string name="poi_fuel_e10_yes">E10</string>
-	<string name="poi_fuel_e20_yes">E20</string>
-	<string name="poi_fuel_e85_yes">E85</string>
-	<string name="poi_fuel_biogas_yes">E85</string>
-	<string name="poi_fuel_LH2_yes">Liquid hydrogen</string>
-	<string name="poi_fuel_electricity_yes">Electricity</string>
+	<string name="poi_fuel:diesel">Diesel</string>
+	<string name="poi_fuel:gtl_diesel">GTL diesel</string>
+	<string name="poi_fuel:hgv_diesel">HGV diesel</string>
+	<string name="poi_fuel:biodiesel">Bio diesel</string>
+	<string name="poi_fuel:lpg">LPG</string>
+	<string name="poi_fuel:octane_80">Octane 80</string>
+	<string name="poi_fuel:octane_91">Octane 91</string>
+	<string name="poi_fuel:octane_92">Octane 92</string>
+	<string name="poi_fuel:octane_95">Octane 95</string>
+	<string name="poi_fuel:octane_98">Octane 98</string>
+	<string name="poi_fuel:octane_100">Octane 100</string>
+	<string name="poi_fuel:cng">CNG</string>
+	<string name="poi_fuel:1_25">1:25 fuel</string>
+	<string name="poi_fuel:1_50">1:50 fuel</string>
+	<string name="poi_fuel:ethanol">Ethanol</string>
+	<string name="poi_fuel:methanol">Methanol</string>
+	<string name="poi_fuel:svo">SVO</string>
+	<string name="poi_fuel:e10">E10</string>
+	<string name="poi_fuel:e20">E20</string>
+	<string name="poi_fuel:e85">E85</string>
+	<string name="poi_fuel:biogas">E85</string>
+	<string name="poi_fuel:lh2">Liquid hydrogen</string>
+	<string name="poi_fuel:electricity">Electricity</string>
 	<string name="poi_charging_station">Charging station</string>
 	<string name="poi_vehicle_ramp">Vehicle ramp</string>
 	<string name="poi_compressed_air">Compressed air</string>
@@ -442,6 +444,7 @@
 	<string name="poi_rowing">Rowing</string>
 	<string name="poi_rugby_union">Rugby union</string>
 	<string name="poi_rugby_league">Rugby league</string>
+	<string name="poi_sailing">Sailing</string>
 	<string name="poi_shooting">Shooting</string>
 	<string name="poi_skating">Skating</string>
 	<string name="poi_skateboard">Skateboard</string>
@@ -461,7 +464,7 @@
 	<string name="poi_archaeological_site">Archaeological site</string>
 	<string name="poi_battlefield">Battlefield</string>
 	<string name="poi_boundary_stone">Boundary stone</string>
-	<string name="poi_cannon">Historic cannon</string>
+	<string name="poi_historic_cannon">Historic cannon</string>
 	<string name="poi_castle">Castle</string>
 	<string name="poi_city_gate">City gate</string>
 	<string name="poi_fort">Fort</string>
@@ -530,6 +533,7 @@
 	<string name="poi_geyser">Geyser</string>
 	<string name="poi_cemetery">Cemetery</string>
 	<string name="poi_grave_yard">Graveyard</string>
+	<string name="poi_tomb">Tomb</string>
 	<string name="poi_shelter">Shelter</string>
 	<string name="poi_funicular">Funicular</string>
 	<string name="poi_resort">Resort</string>
@@ -559,15 +563,15 @@
 	<string name="poi_club_tourism">Tourism club</string>
 	<string name="poi_club_charity">Charity club</string>
 
-	<string name="piste_downhill">Downhill</string>
-	<string name="piste_nordic">Nordic</string>
-	<string name="piste_skitour">Skitour</string>
-	<string name="piste_hike">Hike</string>
-	<string name="piste_sleigh">Sleigh</string>
-	<string name="piste_sled">Sled</string>
-	<string name="piste_snow_park">Snow park</string>
-	<string name="piste_playground">Playground</string>
-	<string name="piste_ice_skate">Ice skate</string>
+	<string name="poi_piste_downhill">Downhill</string>
+	<string name="poi_piste_nordic">Nordic</string>
+	<string name="poi_piste_skitour">Skitour</string>
+	<string name="poi_piste_hike">Hike</string>
+	<string name="poi_piste_sleigh">Sleigh</string>
+	<string name="poi_piste_sled">Sled</string>
+	<string name="poi_piste_snow_park">Snow park</string>
+	<string name="poi_piste_playground">Playground</string>
+	<string name="poi_piste_ice_skate">Ice skate</string>
 
 	<string name="poi_library">Library</string>
 	<string name="poi_arts_centre">Arts centre</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index 90f1205ed8..b00cc65813 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -250,26 +250,22 @@ public class MapActivityLayers {
 			return GpxUiHelper.selectGPXFile(files, activity, true, true, callbackWithObject);
 		}
 	}
-	
-	
-	
-	
-	
+
+
 	public AlertDialog selectPOIFilterLayer(final OsmandMapTileView mapView, final PoiLegacyFilter[] selected){
 		OsmandApplication app = (OsmandApplication) getApplication();
 		final PoiFiltersHelper poiFilters = app.getPoiFilters();
 		final ContextMenuAdapter adapter = new ContextMenuAdapter(activity);
 		adapter.item(R.string.shared_string_search).iconColor(R.drawable.ic_action_search_dark).reg();
 		final List<PoiLegacyFilter> list = new ArrayList<PoiLegacyFilter>();
+		list.add(poiFilters.getCustomPOIFilter());
 		for (PoiLegacyFilter f : poiFilters.getTopDefinedPoiFilters()) {
 			addFilterToList(adapter, list, f);
 		}
-		list.add(poiFilters.getCustomPOIFilter());
 		
 		Builder builder = new AlertDialog.Builder(activity);
 		ListAdapter listAdapter = adapter.createListAdapter(activity, app.getSettings().isLightContent());
 		builder.setAdapter(listAdapter, new DialogInterface.OnClickListener(){
-
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				PoiLegacyFilter pf = list.get(which);