diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index 59912e54bd..c9ad8c06b9 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -283,7 +283,7 @@
   <string name="search_position_current_location_found">Ligging (gevind)</string>
   <string name="search_position_address">Adres…</string>
   <string name="search_position_favorites">Gunstelinge…</string>
-  <string name="search_position_undefined">ongedefinieerd</string>
+  <string name="shared_string_undefined">ongedefinieerd</string>
   
   
   <string name="search_position_map_view">Laaste kaart uitsig</string>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 881455e2d9..156aa422ac 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -666,7 +666,7 @@
     <string name="search_position_current_location_found">موقعي ( تم تحديده )</string>
     <string name="search_position_address">عنوان…</string>
     <string name="search_position_favorites">المفضلة…</string>
-    <string name="search_position_undefined">غير محدد</string>
+    <string name="shared_string_undefined">غير محدد</string>
     <string name="search_position_map_view">مركز الخريطة الحالي</string>
     <string name="select_search_position">المنطلق:</string>
     <string name="context_menu_item_search">بحث بالجوار</string>
diff --git a/OsmAnd/res/values-b+be+Latn/strings.xml b/OsmAnd/res/values-b+be+Latn/strings.xml
index 68f3cc2d12..433a73adec 100644
--- a/OsmAnd/res/values-b+be+Latn/strings.xml
+++ b/OsmAnd/res/values-b+be+Latn/strings.xml
@@ -920,7 +920,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="search_position_current_location_found">Majo stanovіšča (znojdziena)</string>
     <string name="search_position_address">Adras…</string>
     <string name="search_position_favorites">Ulubionyja…</string>
-    <string name="search_position_undefined">Niavyznačana</string>
+    <string name="shared_string_undefined">Niavyznačana</string>
     <string name="search_position_map_view">Ciapierašni centr mapy</string>
     <string name="select_search_position">Pačatak:</string>
     <string name="context_menu_item_search">Šukać navokal</string>
diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml
index f6eee351c8..ef2efdbf0c 100644
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@@ -1090,7 +1090,7 @@
     <string name="animate_route">Simulaciju startować</string>
     <string name="file_can_not_be_renamed">Dataja njehodźi so přemjenować.</string>
     <string name="file_with_name_already_exists">Dataja z tutym mjenom hižo eksistuje.</string>
-    <string name="search_position_undefined">njedefinowane</string>
+    <string name="shared_string_undefined">njedefinowane</string>
     <string name="route_successfully_saved_at">Čara składowana jako \'%1$s\'.</string>
     <string name="local_index_descr_title">Kartowe dataje zrjadować.</string>
     <string name="local_indexes_cat_poi">POI-daty</string>
diff --git a/OsmAnd/res/values-b+kab/strings.xml b/OsmAnd/res/values-b+kab/strings.xml
index f2691d0b11..300cc01de1 100644
--- a/OsmAnd/res/values-b+kab/strings.xml
+++ b/OsmAnd/res/values-b+kab/strings.xml
@@ -540,7 +540,7 @@
     <string name="global_settings">Iɣewwaren Imuta</string>
     <string name="city_type_city">Tiɣremt</string>
     <string name="search_position_favorites">Imenyafen …</string>
-    <string name="search_position_undefined">D arbadu</string>
+    <string name="shared_string_undefined">D arbadu</string>
     <string name="select_search_position">Taneṣlit :</string>
     <string name="favorite_places_category">Imukan</string>
     <string name="shared_string_release">Yeffeɣ-d</string>
diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
index ef24407d53..88e8d8e9b0 100644
--- a/OsmAnd/res/values-b+sr+Latn/strings.xml
+++ b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -132,7 +132,7 @@
 	
 	<string name="poi_filter_nominatim">Online Nominatim</string>
 	<string name="search_position_address">Adresa …</string>
-	<string name="search_position_undefined">Neodređeno</string>
+	<string name="shared_string_undefined">Neodređeno</string>
 	
 	<string name="layer_map_appearance">Konfiguracija ekrana</string>
 	<string name="show_lanes">Prikaži trake</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 10ef38a0f0..988e0c1d18 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -605,7 +605,7 @@
     <string name="search_position_current_location_found">Маё становішча (знойдзена)</string>
     <string name="search_position_address">Адрас…</string>
     <string name="search_position_favorites">Улюбёныя мясціны…</string>
-    <string name="search_position_undefined">Нявызначана</string>
+    <string name="shared_string_undefined">Нявызначана</string>
     <string name="search_position_map_view">Цяперашні цэнтр мапы</string>
     <string name="select_search_position">Пачатак:</string>
     <string name="context_menu_item_search">Шукаць навокал</string>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 1238c5a8b9..72b05a3ff5 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -505,7 +505,7 @@
     <string name="search_position_current_location_found">Моето място (намерено)</string>
     <string name="search_position_address">Адрес…</string>
     <string name="search_position_favorites">Предпочитани…</string>
-    <string name="search_position_undefined">Неопределена</string>
+    <string name="shared_string_undefined">Неопределена</string>
     <string name="search_position_map_view">Текущ център на картата</string>
     <string name="select_search_position">Начална точка:</string>
     <string name="context_menu_item_search">Търси близо до това място</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 27ec7ebddc..6000330678 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -219,7 +219,7 @@
     <string name="search_position_current_location_search">S\'està cercant la posició…</string>
     <string name="search_position_current_location_found">La meva posició (trobada)</string>
     <string name="search_position_address">Adreça…</string>
-    <string name="search_position_undefined">Indefinida</string>
+    <string name="shared_string_undefined">Indefinida</string>
     <string name="context_menu_item_search">Cerca pel voltant</string>
     <string name="shared_string_save_as_gpx">Desa com un nou fitxer GPX</string>
     <string name="route_successfully_saved_at">La ruta s\'ha desat com a «%1$s».</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index f8f7d4196d..9ed07ed243 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -156,7 +156,7 @@
     <string name="search_position_current_location_found">Moje poloha [nalezeno]</string>
     <string name="search_position_address">Adresy…</string>
     <string name="search_position_favorites">Oblíbených…</string>
-    <string name="search_position_undefined">Nedefinováno</string>
+    <string name="shared_string_undefined">Nedefinováno</string>
     <string name="search_position_map_view">Současný střed mapy</string>
     <string name="select_search_position">Počáteční bod:</string>
     <string name="context_menu_item_search">Hledat v okolí</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index addb268595..b7c15305b1 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -427,7 +427,7 @@
     <string name="search_position_current_location_found">Positionen (fundet)</string>
     <string name="search_position_address">Adresse…</string>
     <string name="search_position_favorites">Favoritter…</string>
-    <string name="search_position_undefined">Ikke defineret</string>
+    <string name="shared_string_undefined">Ikke defineret</string>
     <string name="search_position_map_view">Nuværende kortcenter</string>
     <string name="select_search_position">Udgangspunkt:</string>
     <string name="context_menu_item_search">Søg i nærheden</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index c6aa61825e..90d5c82b64 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -358,7 +358,7 @@
     <string name="search_position_current_location_found">Mein Standort (gefunden)</string>
     <string name="search_position_address">Adresse …</string>
     <string name="search_position_favorites">Favoriten …</string>
-    <string name="search_position_undefined">Undefiniert</string>
+    <string name="shared_string_undefined">Undefiniert</string>
     <!-- string name="search_position_current_location">Aktueller Standort…</string -->
     <string name="search_position_map_view">Aktueller Kartenmittelpunkt</string>
     <string name="select_search_position">Ausgangspunkt:</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index df52e8653d..b002846441 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -356,7 +356,7 @@
     <string name="search_position_current_location_found">Η θέση μου (βρέθηκε)</string>
     <string name="search_position_address">Διεύθυνση…</string>
     <string name="search_position_favorites">Αγαπημένα…</string>
-    <string name="search_position_undefined">Ακαθόριστο</string>
+    <string name="shared_string_undefined">Ακαθόριστο</string>
     <string name="search_position_map_view">Τρέχον κέντρο χάρτη</string>
     <string name="select_search_position">Πηγή:</string>
     <string name="context_menu_item_search">Αναζήτηση κοντινών αποστάσεων</string>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index abc772d98d..1a60cb94aa 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -1376,7 +1376,7 @@
     <string name="search_position_current_location_found">Mia pozicio (determinita)</string>
     <string name="search_position_address">Adreso…</string>
     <string name="search_position_favorites">Ŝatataj…</string>
-    <string name="search_position_undefined">Nedifinita</string>
+    <string name="shared_string_undefined">Nedifinita</string>
     <string name="search_position_map_view">Nuna map-centro</string>
     <string name="select_search_position">El:</string>
     <string name="context_menu_item_search">Serĉi proksime</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 6a4d446d06..1cfd4a805e 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -1085,7 +1085,7 @@
     <string name="search_position_current_location_found">Mi ubicación (encontrada)</string>
     <string name="search_position_address">Dirección…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Indefinido</string>
+    <string name="shared_string_undefined">Indefinido</string>
     <string name="search_position_map_view">Vista actual del mapa</string>
     <string name="select_search_position">Origen:</string>
     <string name="context_menu_item_search">Buscar cerca</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 9f1df61511..b23678c94f 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -1085,7 +1085,7 @@
     <string name="search_position_current_location_found">Mi ubicación (encontrada)</string>
     <string name="search_position_address">Dirección…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Indefinido</string>
+    <string name="shared_string_undefined">Indefinido</string>
     <string name="search_position_map_view">Vista actual del mapa</string>
     <string name="select_search_position">Origen:</string>
     <string name="context_menu_item_search">Buscar cerca</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index fad71be324..b40c247c96 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -107,7 +107,7 @@
     <string name="search_position_current_location_found">Mi ubicación (encontrada)</string>
     <string name="search_position_address">Dirección…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Indefinido</string>
+    <string name="shared_string_undefined">Indefinido</string>
     <string name="search_position_map_view">Vista actual del mapa</string>
     <string name="select_search_position">Origen:</string>
     <string name="context_menu_item_search">Buscar cerca</string>
diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml
index c20de763d4..0fcf8b0886 100644
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@@ -1987,7 +1987,7 @@
     <string name="search_position_current_location_found">Minu asukoht (leitud)</string>
     <string name="search_position_address">Aadress…</string>
     <string name="search_position_favorites">Lemmikud…</string>
-    <string name="search_position_undefined">Määramata</string>
+    <string name="shared_string_undefined">Määramata</string>
     <string name="search_position_map_view">Praegune kaardi keskkoht</string>
     <string name="select_search_position">Päritolu:</string>
     <string name="context_menu_item_search">Otsi lähedusest</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 69685b97e5..b82a922dad 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -574,7 +574,7 @@
     <string name="search_position_current_location_found">Nire kokapena (aurkitua)</string>
     <string name="search_position_address">Helbidea…</string>
     <string name="search_position_favorites">Gogokoak…</string>
-    <string name="search_position_undefined">Indefinitua</string>
+    <string name="shared_string_undefined">Indefinitua</string>
     <string name="search_position_map_view">Uneko maparen zentroa</string>
     <string name="select_search_position">Jatorria:</string>
     <string name="context_menu_item_search">Bilatu inguruan</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 824a98370c..7d817b155f 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -342,7 +342,7 @@
     <string name="search_position_current_location_found">موقعیت من (پیدا‌شده)</string>
     <string name="search_position_address">نشانی…</string>
     <string name="search_position_favorites">علاقه‌مندی‌ها…</string>
-    <string name="search_position_undefined">نامشخص</string>
+    <string name="shared_string_undefined">نامشخص</string>
     <string name="delete_confirmation_msg">‏%1$s حذف شود؟</string>
     <string name="city_type_suburb">حومه</string>
     <string name="city_type_hamlet">دهکده</string>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index ecbbad329f..c977056828 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -191,7 +191,7 @@
     <string name="search_position_current_location_found">Sijaintini (löydetty)</string>
     <string name="search_position_address">Osoite…</string>
     <string name="search_position_favorites">Suosikit…</string>
-    <string name="search_position_undefined">Määrittelemätön</string>
+    <string name="shared_string_undefined">Määrittelemätön</string>
     <string name="select_search_position">Alkuperä:</string>
     <string name="shared_string_save">Tallenna</string>
     <string name="local_index_upload_gpx_description">Lähetä GPX tiedostot OSM yhteisölle. Niitä käytetään karttojen parantamiseen.</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index e11944f900..b126eec544 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -94,7 +94,7 @@
     <string name="search_position_current_location_found">Ma position</string>
     <string name="search_position_address">Adresse…</string>
     <string name="search_position_favorites">Favori…</string>
-    <string name="search_position_undefined">Non défini</string>
+    <string name="shared_string_undefined">Non défini</string>
     <string name="search_position_map_view">Centre de la carte</string>
     <string name="select_search_position">Autour de :</string>
     <string name="context_menu_item_search">Rechercher à proximité</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index ea17f33034..cbbd64ac7e 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -852,7 +852,7 @@
     <string name="search_position_current_location_found">A miña posición (atopada)</string>
     <string name="search_position_address">Enderezo…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Sen definir</string>
+    <string name="shared_string_undefined">Sen definir</string>
     <string name="search_position_map_view">Centro do mapa actual</string>
     <string name="select_search_position">Orixe:</string>
     <string name="context_menu_item_search">Procurar preto daquí</string>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index 4f7b17e7b0..8a90da3cbf 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -668,7 +668,7 @@
     <string name="route_successfully_saved_at">Ruta je uspješno spremljena kao \'%1$s\'.</string>
     <string name="filename_input">Naziv datoteke: </string>
     <string name="context_menu_item_search">Traži u blizini ovog mjesta</string>
-    <string name="search_position_undefined">Nedefinirano</string>
+    <string name="shared_string_undefined">Nedefinirano</string>
     <string name="search_position_map_view">Posljednje gledano na karti</string>
     <string name="select_search_position">Traži u blizini:</string>
     <string name="search_position_current_location_search">Tražim poziciju-…</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 5d2607f1ef..e5d4536cdf 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -157,7 +157,7 @@
     <string name="search_position_current_location_found">Pozícióm (megtalálva)</string>
     <string name="search_position_address">Cím…</string>
     <string name="search_position_favorites">Kedvencek…</string>
-    <string name="search_position_undefined">Meghatározatlan</string>
+    <string name="shared_string_undefined">Meghatározatlan</string>
     <string name="search_position_map_view">Jelenlegi térképközéppont</string>
     <string name="select_search_position">Eredet:</string>
     <string name="context_menu_item_search">Keresés a közelben</string>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index c8c71b8bb1..2f4d1757c0 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -1916,7 +1916,7 @@
     <string name="search_position_current_location_found">Իմ դիրքը (որոշված է)</string>
     <string name="search_position_address">Հասցե…</string>
     <string name="search_position_favorites">«Սիրված»…</string>
-    <string name="search_position_undefined">Անորոշ է</string>
+    <string name="shared_string_undefined">Անորոշ է</string>
     <string name="search_position_map_view">Ընթացիկ քարտեզի կենտրոնը</string>
     <string name="select_search_position">Սկիզբ՝</string>
     <string name="context_menu_item_search">Որոնել մոտակայքում</string>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index d5619f7a96..c0fc3c3942 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -539,7 +539,7 @@
     <string name="city_type_city">Borg/Sveitarfélag</string>
     <string name="search_position_address">Heimilisfang…</string>
     <string name="search_position_favorites">Eftirlæti…</string>
-    <string name="search_position_undefined">Óskilgreint</string>
+    <string name="shared_string_undefined">Óskilgreint</string>
     <string name="search_position_map_view">Núverandi miðja korts</string>
     <string name="select_search_position">Upphaf:</string>
     <string name="context_menu_item_search">Leita í nágrenninu</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index e9439c7af2..73038fd2b7 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -80,7 +80,7 @@
     <string name="search_position_current_location_found">La mia posizione (trovata)</string>
     <string name="search_position_address">Indirizzo…</string>
     <string name="search_position_favorites">Preferiti…</string>
-    <string name="search_position_undefined">Non definito</string>
+    <string name="shared_string_undefined">Non definito</string>
     <string name="search_position_map_view">Attuale centro della mappa</string>
     <string name="select_search_position">Origine:</string>
     <string name="context_menu_item_search">Cerca nelle vicinanze</string>
diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml
index 2daaed73c7..7332938f25 100644
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@@ -346,7 +346,7 @@
     <string name="search_position_current_location_found">המיקום שלי (נמצא)</string>
     <string name="search_position_address">כתובת…</string>
     <string name="search_position_favorites">מועדפים…</string>
-    <string name="search_position_undefined">בלתי מוגדר</string>
+    <string name="shared_string_undefined">בלתי מוגדר</string>
     <string name="search_position_map_view">מרכז המפה הנוכחי</string>
     <string name="select_search_position">מקור:</string>
     <string name="context_menu_item_search">חיפוש בסביבת מקום</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 717c470f5c..f3a25fe9ea 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -988,7 +988,7 @@ POIの更新は利用できません</string>
     <string name="search_position_current_location_found">現在地(確定)</string>
     <string name="search_position_address">住所…</string>
     <string name="search_position_favorites">お気に入り…</string>
-    <string name="search_position_undefined">未定義</string>
+    <string name="shared_string_undefined">未定義</string>
     <string name="search_position_map_view">マップ画面中心</string>
     <string name="select_search_position">検索基点:</string>
     <string name="context_menu_item_search">近隣を検索</string>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 7458713fa9..8750a21af0 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -186,7 +186,7 @@
     <string name="search_position_current_location_found">მდებარეობა (ნაპოვნია)</string>
     <string name="search_position_address">მისამართი…</string>
     <string name="search_position_favorites">რჩეულები…</string>
-    <string name="search_position_undefined">არააღწერილი</string>
+    <string name="shared_string_undefined">არააღწერილი</string>
     <string name="search_position_map_view">უკანასკნელად ნანახი რუკის ხედი</string>
     <string name="select_search_position">ძებნა ახლოს :</string>
     <string name="context_menu_item_search">ახლოს ძებნა</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 8b47bae519..17f9e25516 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -120,7 +120,7 @@
     <string name="search_position_current_location_found">위치(발견)</string>
     <string name="search_position_address">주소…</string>
     <string name="search_position_favorites">즐겨찾기…</string>
-    <string name="search_position_undefined">정의되지 않음</string>
+    <string name="shared_string_undefined">정의되지 않음</string>
     <string name="search_position_map_view">현재 지도 센터링</string>
     <string name="select_search_position">원점 :</string>
     <string name="context_menu_item_search">가까운 주변 검색</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 0c0692c543..a85be4ac26 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -239,7 +239,7 @@ Tam prireiks {1} MB pastoviam saugojimui.
     <string name="search_position_current_location_found">Mano vieta (rasta)</string>
     <string name="search_position_address">Adresas…</string>
     <string name="search_position_favorites">Įsimintos…</string>
-    <string name="search_position_undefined">Nenurodyta</string>
+    <string name="shared_string_undefined">Nenurodyta</string>
     <string name="search_position_map_view">Esamo žemėlapio centras</string>
     <string name="select_search_position">Pradžia:</string>
     <string name="context_menu_item_search">Ieškoti aplink</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index a837a8252b..8356c4149b 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -167,7 +167,7 @@
     <string name="search_position_current_location_found">Mana vieta (atrasta)</string>
     <string name="search_position_address">Adrese…</string>
     <string name="search_position_favorites">Izlase…</string>
-    <string name="search_position_undefined">Nedefinēts</string>
+    <string name="shared_string_undefined">Nedefinēts</string>
     <string name="search_position_map_view">Kartes centrs</string>
     <string name="select_search_position">Reģions:</string>
     <string name="context_menu_item_search">Meklēt tuvumā</string>
diff --git a/OsmAnd/res/values-ml/strings.xml b/OsmAnd/res/values-ml/strings.xml
index 947cb21a92..b497e0ada7 100644
--- a/OsmAnd/res/values-ml/strings.xml
+++ b/OsmAnd/res/values-ml/strings.xml
@@ -1291,7 +1291,7 @@
     <string name="search_position_current_location_found">എന്റെ സ്ഥാനം (കണ്ടെത്തിയത്)</string>
     <string name="search_position_address">വിലാസം…</string>
     <string name="search_position_favorites">ഇഷ്ടമുളളവ…</string>
-    <string name="search_position_undefined">നിഷ്കര്‍ഷിക്കപെടാത്തത്</string>
+    <string name="shared_string_undefined">നിഷ്കര്‍ഷിക്കപെടാത്തത്</string>
     <string name="select_search_position">മൂലസ്ഥാനം:</string>
     <string name="local_index_upload_gpx_description">ഓഎസ്എം കംമ്മ്യൂണിറ്റിക്ക് ജിപിഎക്സ് ഫയലുകള്‍ കയറ്റി അയക്കുക (അപ്ലോഡ്). അവര്‍ക്ക് ഇത് ഭൂപടങ്ങള്‍ മെച്ച്പ്പെടുത്താന്‍ ഉപകരിക്കും.</string>
     <string name="local_index_items_uploaded">%2$d യില്‍ %1$d ഇനങ്ങള്‍ വിജയകരമായ് കയറ്റിയിരിക്കുന്നു(അപ്ലോഡ്).</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 12bee1fb8e..c065bc69d8 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -227,7 +227,7 @@
     <string name="search_position_current_location_found">Min posisjon (funnet)</string>
     <string name="search_position_address">Adresse…</string>
     <string name="search_position_favorites">Favoritter…</string>
-    <string name="search_position_undefined">Udefinert</string>
+    <string name="shared_string_undefined">Udefinert</string>
     <string name="search_position_map_view">Gjeldende kartsenter</string>
     <string name="select_search_position">Utgangspunkt:</string>
     <string name="context_menu_item_search">Søk i nærheten</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 975407761f..88b8f3c1a6 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -656,7 +656,7 @@
     <string name="search_position_current_location_found">Huidige Positie (gevonden)</string>
     <string name="search_position_address">Adres…</string>
     <string name="search_position_favorites">Favorieten…</string>
-    <string name="search_position_undefined">Ongedefinieerd</string>
+    <string name="shared_string_undefined">Ongedefinieerd</string>
     <string name="local_index_routing_data">Navigatiedata</string>
     <string name="navigate_point_format">Formaat</string>
     <string name="poi_search_desc">Zoek POI (interessepunt)</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 7e577df92d..bae32160b6 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -36,7 +36,7 @@
     <string name="search_position_current_location_found">Aktualne położenie (ustalone)</string>
     <string name="search_position_address">Adres…</string>
     <string name="search_position_favorites">Ulubione…</string>
-    <string name="search_position_undefined">Niezdefiniowane</string>
+    <string name="shared_string_undefined">Niezdefiniowane</string>
     <string name="search_position_map_view">Aktualny środek mapy</string>
     <string name="select_search_position">Zasób:</string>
     <string name="context_menu_item_search">Szukaj w pobliżu</string>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 27021aa6e9..76a1d52d15 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -1135,7 +1135,7 @@
     <string name="search_position_current_location_found">Minha Posição (encontrada)</string>
     <string name="search_position_address">Endereço…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Indefinido</string>
+    <string name="shared_string_undefined">Indefinido</string>
     <string name="search_position_map_view">Centro atual do mapa</string>
     <string name="select_search_position">Próximo a:</string>
     <string name="route_successfully_saved_at">Rota salva como \'%1$s\'.</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index e3a77032a9..572c0df628 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -563,7 +563,7 @@
     <string name="search_position_current_location_found">Minha posição (encontrada)</string>
     <string name="search_position_address">Endereço…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Sem definir</string>
+    <string name="shared_string_undefined">Sem definir</string>
     <string name="search_position_map_view">Centro do mapa atual</string>
     <string name="select_search_position">Pesquisar próximo a:</string>
     <string name="context_menu_item_search">Pesquisar nas proximidades</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index c0a9abe434..60006cc446 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -342,7 +342,7 @@
     <string name="search_position_current_location_found">Poziție curentă (găsită)</string>
     <string name="search_position_address">Adresă…</string>
     <string name="search_position_favorites">Favorite…</string>
-    <string name="search_position_undefined">Necunoscută</string>
+    <string name="shared_string_undefined">Necunoscută</string>
     <string name="search_position_map_view">Ultima afișare a hărții</string>
     <string name="select_search_position">Origine:</string>
     <string name="context_menu_item_search">Căutare în împrejurimi</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 644216cf35..5caa77cc9b 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -465,7 +465,7 @@
     <string name="search_position_current_location_found">Моё местоположение (найдено)</string>
     <string name="search_position_address">Адрес…</string>
     <string name="search_position_favorites">Избранные…</string>
-    <string name="search_position_undefined">Неопределённо</string>
+    <string name="shared_string_undefined">Неопределённо</string>
     <string name="search_position_map_view">Текущий центр карты</string>
     <string name="select_search_position">Начало:</string>
     <string name="context_menu_item_search">Искать рядом</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index c758a23f9c..22a48411e5 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -843,7 +843,7 @@
     <string name="update_poi_file_not_found">Su documentu pro registrare sas modìficas de sos PDI no est istadu ne agatadu nen creadu.</string>
     <string name="map_version_changed_info">Iscàrriga sa versione noa de s\'aplicatzione pro pòdere impreare sos documentos de sa mapa noos.</string>
     <string name="shared_string_rename">Càmbia su nùmene</string>
-    <string name="search_position_undefined">Non dessinidu</string>
+    <string name="shared_string_undefined">Non dessinidu</string>
     <string name="search_position_map_view">Tzentru atuale de sa mapa</string>
     <string name="local_index_mi_upload_gpx">Imbia ad OSM</string>
     <string name="favourites_delete_multiple_succesful">Puntos preferidos iscantzellados.</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index be5ff4790f..31daa5e9f2 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -230,7 +230,7 @@
     <string name="search_position_current_location_found">Moja poloha (nájdená)</string>
     <string name="search_position_address">Adresa…</string>
     <string name="search_position_favorites">Obľúbené miesta…</string>
-    <string name="search_position_undefined">Neurčené</string>
+    <string name="shared_string_undefined">Neurčené</string>
     <string name="search_position_map_view">Stred mapy teraz</string>
     <string name="select_search_position">Východzí bod:</string>
     <string name="context_menu_item_search">Hľadať v okolí</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 7db3977500..7b85d03b65 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -427,7 +427,7 @@
     <string name="choose_auto_follow_route_descr">Časovni zamik, preden se položaj samodejno postavi v središče zemljevida.</string>
     <string name="fast_route_mode">Najhitrejša pot</string>
     <string name="fast_route_mode_descr">Izbrana možnost določa izbor najhitrejše poti oziroma poti z najmanjšo porabo goriva.</string>
-    <string name="search_position_undefined">Nedoločeno</string>
+    <string name="shared_string_undefined">Nedoločeno</string>
     <string name="search_position_map_view">Trenutna sredina zemljevida</string>
     <string name="search_position_address">Naslov …</string>
     <string name="city_type_city">Mesto</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 78c2cc5853..b68977c13a 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -117,7 +117,7 @@
     <string name="shared_string_rename">Преименуј</string>
     <string name="poi_filter_nominatim">Online Nominatim</string>
     <string name="search_position_address">Адреса…</string>
-    <string name="search_position_undefined">Неодређено</string>
+    <string name="shared_string_undefined">Неодређено</string>
     <string name="layer_map_appearance">Конфигурација екрана</string>
     <string name="show_lanes">Траке</string>
     <string name="avoid_unpaved">Без неасфалтираних путева</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 36934d43c5..2ac9b07eff 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -336,7 +336,7 @@ Nyttjat utrymme är {1} MB.
     <string name="search_position_current_location_found">Min position (hittad)</string>
     <string name="search_position_address">Adresser …</string>
     <string name="search_position_favorites">Favoriter …</string>
-    <string name="search_position_undefined">Odefinierad</string>
+    <string name="shared_string_undefined">Odefinierad</string>
     <string name="search_position_map_view">Aktuell kartmitt</string>
     <string name="select_search_position">Ursprung:</string>
     <string name="context_menu_item_search">Sök i närheten</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 460f321ae1..fe20e78c5e 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -617,7 +617,7 @@
     <string name="map_version_changed_info">Yeni harita dosyalarını kullanabilmek için uygulamanın yeni sürümünü indirin.</string>
     <string name="search_position_current_location_search">Konum aranıyor…</string>
     <string name="search_position_current_location_found">Benim Konum (bulundu)</string>
-    <string name="search_position_undefined">Tanımlanmamış</string>
+    <string name="shared_string_undefined">Tanımlanmamış</string>
     <string name="search_position_map_view">Güncel harita merkezi</string>
     <string name="select_search_position">Menşei:</string>
     <string name="context_menu_item_search">Yakınlarda ara</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 7f83659cd2..23940857f7 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -210,7 +210,7 @@
     <string name="search_position_current_location_found">Моя позиція (знайдена)</string>
     <string name="search_position_address">Адреса…</string>
     <string name="search_position_favorites">Закладки…</string>
-    <string name="search_position_undefined">Невизначено</string>
+    <string name="shared_string_undefined">Невизначено</string>
     <string name="search_position_map_view">Поточний центр мапи</string>
     <string name="select_search_position">Початок:</string>
     <string name="context_menu_item_search">Шукати поруч</string>
diff --git a/OsmAnd/res/values-vi/strings.xml b/OsmAnd/res/values-vi/strings.xml
index 0d88e20967..00a92a8e12 100644
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@@ -40,7 +40,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --><resources>
 	<string name="search_position_current_location_found">Vị trí (Đã tìm thấy)</string>
 	<string name="search_position_address">Địa chỉ…</string>
 	<string name="search_position_favorites">Ưa thích…</string>
-	<string name="search_position_undefined">Chưa rõ</string>
+	<string name="shared_string_undefined">Chưa rõ</string>
 	
 	
 	<string name="search_position_map_view">Lần hiển thị bản đồ trước</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index eaa040c241..9c37f8806c 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -571,7 +571,7 @@
     <string name="search_position_current_location_found">我的位置（已找到）</string>
     <string name="search_position_address">地址…</string>
     <string name="search_position_favorites">收藏夹…</string>
-    <string name="search_position_undefined">未定义</string>
+    <string name="shared_string_undefined">未定义</string>
     <string name="search_position_map_view">上次地图显示位置</string>
     <string name="route_successfully_saved_at">路线已成功保存为 \'%1$s\'。</string>
     <string name="filename_input">文件名： </string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index c261ef837c..e983b217f6 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -377,7 +377,7 @@
     <string name="search_position_current_location_found">我的位置 (找到)</string>
     <string name="search_position_address">地址…</string>
     <string name="search_position_favorites">我的收藏…</string>
-    <string name="search_position_undefined">未定義</string>
+    <string name="shared_string_undefined">未定義</string>
     <string name="search_position_map_view">目前的地圖中心</string>
     <string name="select_search_position">起點：</string>
     <string name="context_menu_item_search">在附近查尋</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 0c881d6586..cb09000cdc 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -3147,7 +3147,7 @@
     <string name="search_position_current_location_found">My Position (found)</string>
     <string name="search_position_address">Address…</string>
     <string name="search_position_favorites">Favorites…</string>
-    <string name="search_position_undefined">Undefined</string>
+    <string name="shared_string_undefined">Undefined</string>
     <!-- string name="search_position_current_location">Current position…</string -->
     <string name="search_position_map_view">Current map center</string>
     <string name="select_search_position">Origin:</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
index 7d4faf5640..54d4e6cca5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
@@ -208,12 +208,12 @@ public class SearchActivity extends TabActivity implements OsmAndLocationListene
 	private void setTopSpinner() {
 		spinnerAdapter = new ArrayAdapter<String>(getSupportActionBar().getThemedContext(), R.layout.spinner_item,
 				new ArrayList<String>(Arrays.asList(new String[]{
-						getString(R.string.search_position_undefined),
+						getString(R.string.shared_string_undefined),
 						getString(R.string.shared_string_my_location) + getString(R.string.shared_string_ellipsis),
 						getString(R.string.search_position_map_view),
 						getString(R.string.search_position_favorites),
 						getString(R.string.search_position_address)
-					}))
+				}))
 				) {
 					@Override
 					public View getDropDownView(int position, View convertView, ViewGroup parent) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
index 7880851f71..702e2475e7 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
@@ -114,6 +114,10 @@ public class MeasurementEditingContext {
 		return newGpxData;
 	}
 
+	public boolean isNewData() {
+		return newGpxData == null;
+	}
+
 	public void setNewGpxData(NewGpxData newGpxData) {
 		this.newGpxData = newGpxData;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 4fc4e01069..8607949180 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -282,9 +282,11 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 		mainView.findViewById(R.id.options_button).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				OptionsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(), true,
-						editingCtx.isInSnapToRoadMode(), createOptionsFragmentListener(),
-						editingCtx.getSnapToRoadAppMode());
+				OptionsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
+						editingCtx.isSnapToRoadTrack() || editingCtx.isNewData(),
+						editingCtx.isInSnapToRoadMode(),
+						editingCtx.getSnapToRoadAppMode(), createOptionsFragmentListener()
+				);
 			}
 		});
 
@@ -592,7 +594,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 			}
 			toolBarController.setTitle(getString(R.string.route_between_points));
 			mapActivity.refreshMap();
-			if(editingCtx.isSnapToRoadTrack() || editingCtx.getNewGpxData() == null) {
+			if (editingCtx.isSnapToRoadTrack() || editingCtx.isNewData()) {
 				RouteBetweenPointsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
 						createRouteBetweenPointsFragmentListener(), editingCtx.getCalculationType(),
 						editingCtx.getSnapToRoadAppMode());
@@ -659,10 +661,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 							editingCtx.getBeforePoints().clear();
 							editingCtx.getBeforePoints().addAll(editingCtx.getBeforeTrkSegmentLine().points);
 						}
-						if(editingCtx.getNewGpxData()!=null) {
-							addToGpx(mapActivity);
-						}else {
+						if (editingCtx.isNewData()) {
 							saveAsGpx(SaveType.ROUTE_POINT);
+						} else {
+							addToGpx(mapActivity);
 						}
 					} else {
 						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
@@ -1765,7 +1767,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 				return;
 			}
 			AlertDialog.Builder builder = new AlertDialog.Builder(UiUtilities.getThemedContext(mapActivity, nightMode));
-			if (editingCtx.getNewGpxData() == null) {
+			if (editingCtx.isNewData()) {
 				final File dir = mapActivity.getMyApplication().getAppPath(IndexConstants.GPX_INDEX_DIR);
 				final View view = UiUtilities.getInflater(mapActivity, nightMode).inflate(R.layout.close_measurement_tool_dialog, null);
 				final SwitchCompat showOnMapToggle = (SwitchCompat) view.findViewById(R.id.toggle_show_on_map);
@@ -1823,7 +1825,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 			} else {
 				visibleSnapToRoadIcon(false);
 			}
-			if (editingCtx.getNewGpxData() != null && !planRouteMode) {
+			if (!editingCtx.isNewData() && !planRouteMode) {
 				GPXFile gpx = editingCtx.getNewGpxData().getGpxFile();
 				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
 				newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, gpx.path);
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
index 658c33047c..36fd970dd4 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
@@ -27,6 +27,7 @@ public class OptionsBottomSheetDialogFragment extends MenuBottomSheetDialogFragm
 	private static final Log LOG = PlatformUtil.getLog(OptionsBottomSheetDialogFragment.class);
 
 	public static final String SNAP_TO_ROAD_ENABLED_KEY = "snap_to_road_enabled";
+	public static final String TRACK_SNAPPED_TO_ROAD_KEY = "track_snapped_to_road";
 
 	private OptionsFragmentListener listener;
 	private ApplicationMode routeAppMode;
@@ -43,20 +44,27 @@ public class OptionsBottomSheetDialogFragment extends MenuBottomSheetDialogFragm
 	public void createMenuItems(Bundle savedInstanceState) {
 		Bundle args = getArguments();
 		boolean snapToRoadEnabled = false;
+		boolean trackSnappedToRoad = false;
 		if (args != null) {
 			snapToRoadEnabled = args.getBoolean(SNAP_TO_ROAD_ENABLED_KEY);
+			trackSnappedToRoad = args.getBoolean(TRACK_SNAPPED_TO_ROAD_KEY);
 		}
 
 		items.add(new TitleItem(getString(R.string.shared_string_options)));
 
 		String description;
 		Drawable icon;
-		if (!snapToRoadEnabled || routeAppMode == null) {
-			description = getString(R.string.routing_profile_straightline);
-			icon = getContentIcon(R.drawable.ic_action_split_interval);
+		if (trackSnappedToRoad) {
+			if (!snapToRoadEnabled || routeAppMode == null) {
+				description = getString(R.string.routing_profile_straightline);
+				icon = getContentIcon(R.drawable.ic_action_split_interval);
+			} else {
+				description = routeAppMode.toHumanString();
+				icon = getIcon(routeAppMode.getIconRes(), routeAppMode.getIconColorInfo().getColor(nightMode));
+			}
 		} else {
-			description = routeAppMode.toHumanString();
-			icon = getIcon(routeAppMode.getIconRes(), routeAppMode.getIconColorInfo().getColor(nightMode));
+			description = getString(R.string.shared_string_undefined);
+			icon = getContentIcon(R.drawable.ic_action_help);
 		}
 
 		BaseBottomSheetItem snapToRoadItem = new BottomSheetItemWithDescription.Builder()
@@ -192,17 +200,16 @@ public class OptionsBottomSheetDialogFragment extends MenuBottomSheetDialogFragm
 		params.rightMargin = view.getContext().getResources().getDimensionPixelSize(R.dimen.bottom_sheet_icon_margin_large);
 	}
 
-	public static void showInstance(@NonNull FragmentManager fm, boolean hasRoutePoint, boolean snapToRoad,
-	                                OptionsFragmentListener optionsFragmentListener,
-	                                ApplicationMode routeAppMode) {
+	public static void showInstance(@NonNull FragmentManager fm, boolean trackSnappedToRoad, boolean snapToRoad,
+	                                ApplicationMode routeAppMode, OptionsFragmentListener optionsFragmentListener) {
 		try {
 			if (!fm.isStateSaved()) {
 				Bundle args = new Bundle();
-				args.putBoolean(OptionsBottomSheetDialogFragment.SNAP_TO_ROAD_ENABLED_KEY, snapToRoad);
+				args.putBoolean(TRACK_SNAPPED_TO_ROAD_KEY, trackSnappedToRoad);
+				args.putBoolean(SNAP_TO_ROAD_ENABLED_KEY, snapToRoad);
 				OptionsBottomSheetDialogFragment fragment = new OptionsBottomSheetDialogFragment();
 				fragment.setArguments(args);
 				fragment.setRouteAppMode(routeAppMode);
-				fragment.setUsedOnMap(hasRoutePoint);
 				fragment.setUsedOnMap(true);
 				fragment.setListener(optionsFragmentListener);
 				fragment.show(fm, TAG);