diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index fd0dab7d27..186f21a227 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -711,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>
@@ -730,29 +730,29 @@
 	<string name="poi_valley">Даліна</string>
 	<string name="poi_wood">Лес</string>
 	<string name="poi_landuse">Землекарыстаньне</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_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>
 
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index efe8ffe806..512f1858e6 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -716,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>
@@ -736,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">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_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>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 8fb17303a9..8e8b6c49f0 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -691,40 +691,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">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_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>
@@ -732,15 +732,15 @@
 	<string name="poi_residential">Zone résidentielle</string>
 
 	<string name="poi_landuse">Occupation du sol</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_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>
diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml
index 3e5e5caaa9..20824b1192 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">ディーゼル(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_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>
 
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index 9bc57f3004..537a59adee 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -712,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>
@@ -731,29 +731,29 @@
 	<string name="poi_water">수로</string>
 	<string name="poi_wood">나무</string>
 	<string name="poi_landuse">사유지</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_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>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index d058bb3e6e..fef248336f 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -505,9 +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_fuel_biodiesel">Biodiesel</string>
-	<string name="poi_fuel_lpg">LPG</string>
-	<string name="poi_fuel_cng">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>
@@ -520,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">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_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 b094de137e..692c6a3c3b 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -697,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">Дизель</string>
-	<string name="poi_fuel_ethanol">Этанол</string>
-	<string name="poi_fuel_methanol">Метанол</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 38bbdcb9d8..a37727c869 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -642,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/phrases.xml b/OsmAnd/res/values/phrases.xml
index b5943fbf5c..6f481da8cc 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -173,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">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_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>
@@ -562,15 +562,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>