diff --git a/OsmAnd-telegram/res/values-is/strings.xml b/OsmAnd-telegram/res/values-is/strings.xml
index a915a2e4f4..5a10a5d775 100644
--- a/OsmAnd-telegram/res/values-is/strings.xml
+++ b/OsmAnd-telegram/res/values-is/strings.xml
@@ -155,7 +155,7 @@
     <string name="shared_string_later">Síðar</string>
     <string name="bearing">Stefna</string>
     <string name="unit_of_speed_system">Hraðaeining</string>
-    <string name="shared_string_map">Landakort</string>
+    <string name="shared_string_map">Kort</string>
     <string name="min_logging_speed_descr">Sía: Engin skráning punkta fyrir neðan valinn hraða</string>
     <string name="in_time">í %1$s</string>
     <string name="my_location_search_hint">Leit: Hópur eða tengiliður</string>
diff --git a/OsmAnd/res/layout/settings_group_title.xml b/OsmAnd/res/layout/settings_group_title.xml
index 269d018021..32629ed2de 100644
--- a/OsmAnd/res/layout/settings_group_title.xml
+++ b/OsmAnd/res/layout/settings_group_title.xml
@@ -6,56 +6,50 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<LinearLayout
+	<RelativeLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:minHeight="@dimen/bottom_sheet_title_height"
+		android:paddingStart="@dimen/content_padding"
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingTop="@dimen/content_padding"
+		android:paddingEnd="@dimen/wikilink_bottom_sheet_padding"
 		android:paddingRight="@dimen/wikilink_bottom_sheet_padding"
 		android:paddingBottom="@dimen/wikilink_bottom_sheet_padding">
 
-		<LinearLayout
-			android:layout_width="0dp"
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="@dimen/content_padding"
-			android:layout_marginRight="@dimen/content_padding"
-			android:layout_weight="1"
-			android:orientation="vertical">
+			android:ellipsize="end"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:minHeight="@dimen/default_title_line_height"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			app:lineHeight="@dimen/default_title_line_height"
+			app:typeface="@string/font_roboto_medium"
+			tools:text="Some title" />
 
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/title"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:letterSpacing="@dimen/text_button_letter_spacing"
-				android:minHeight="@dimen/default_title_line_height"
-				android:textColor="?android:textColorPrimary"
-				android:textSize="@dimen/default_list_text_size"
-				app:lineHeight="@dimen/default_title_line_height"
-				app:typeface="@string/font_roboto_medium"
-				tools:text="Some title" />
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/description"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:letterSpacing="@dimen/description_letter_spacing"
-				android:minHeight="@dimen/default_desc_line_height"
-				android:textColor="?android:textColorSecondary"
-				android:textSize="@dimen/default_desc_text_size"
-				app:lineHeight="@dimen/default_desc_line_height"
-				app:typeface="@string/font_roboto_regular"
-				tools:text="Some description" />
-
-		</LinearLayout>
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/description"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@+id/title"
+			android:ellipsize="end"
+			android:letterSpacing="@dimen/description_letter_spacing"
+			android:minHeight="@dimen/default_desc_line_height"
+			android:textColor="?android:textColorSecondary"
+			android:textSize="@dimen/default_desc_text_size"
+			app:lineHeight="@dimen/default_desc_line_height"
+			app:typeface="@string/font_roboto_regular"
+			tools:text="Some description" />
 
 		<net.osmand.plus.widgets.TextViewEx
 			android:id="@+id/selected_size"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_alignParentEnd="true"
+			android:layout_alignParentRight="true"
 			android:letterSpacing="@dimen/text_button_letter_spacing"
 			android:minHeight="@dimen/default_title_line_height"
 			android:textColor="?android:textColorSecondary"
@@ -64,7 +58,7 @@
 			app:typeface="@string/font_roboto_regular"
 			tools:text="5/6" />
 
-	</LinearLayout>
+	</RelativeLayout>
 
 	<LinearLayout
 		android:id="@+id/select_all_button"
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index a298d7653d..236725e959 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -3883,4 +3883,6 @@
     <string name="poi_parking_layby">Langs gaden</string>
     <string name="poi_parking_sheds">Overdækket parkering</string>
     <string name="poi_fuel_lng">LNG</string>
+    <string name="poi_siren">Sirene</string>
+    <string name="poi_nurse">Sygeplejerske</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 950388e493..9d1ba89f5a 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -3883,4 +3883,7 @@
     <string name="poi_liaison_filter">Verbindungsbüro</string>
     <string name="poi_consulate_filter">Konsulat</string>
     <string name="poi_embassy_filter">Botschaft</string>
+    <string name="poi_siren">Sirene</string>
+    <string name="poi_nurse">Krankenpfleger/in</string>
+    <string name="poi_mobile_money_agent">Mobiler Geldvermittler</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 30855ccc5b..cdb42f90dd 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -3887,4 +3887,7 @@
     <string name="poi_liaison_filter">Enlace</string>
     <string name="poi_consulate_filter">Consulado</string>
     <string name="poi_embassy_filter">Embajada</string>
+    <string name="poi_siren">Sirena</string>
+    <string name="poi_nurse">Enfermera</string>
+    <string name="poi_mobile_money_agent">Agente de dinero móvil</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index 726efe646c..5385b21b40 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -3872,4 +3872,7 @@
     <string name="poi_liaison_filter">Összekötő iroda</string>
     <string name="poi_embassy_filter">Külképviselet</string>
     <string name="poi_consulate_filter">Konzulátus</string>
+    <string name="poi_nurse">Ápoló</string>
+    <string name="poi_siren">Sziréna</string>
+    <string name="poi_mobile_money_agent">Mobilpénzfizetési iroda</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 9a88f1bc7c..3f8253cf35 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -3835,4 +3835,37 @@
     <string name="poi_parking_rooftop">Á þaki</string>
     <string name="poi_gpx_point">GPX-punktur</string>
     <string name="poi_radar_tower">Radarturn</string>
+    <string name="poi_mobile_money_agent">Farsímagreiðsluþjónusta</string>
+    <string name="poi_diplomatic_embassy">Sendiráð</string>
+    <string name="poi_diplomatic_services_citizen_services_no">Nei</string>
+    <string name="poi_nurse">Hjúkrunarfræðingur</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Vegabréfsáritun fyrir innflytjendur</string>
+    <string name="poi_embassy_residence">Aðsetur</string>
+    <string name="poi_liaison_subnational">Undirþjóðlegt</string>
+    <string name="poi_siren">Sírena</string>
+    <string name="poi_embassy_mission">Sendinefnd</string>
+    <string name="poi_diplomatic_liaison">Tengifulltrúi</string>
+    <string name="poi_liaison_filter">Tenging</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Já</string>
+    <string name="poi_liaison_liaison_office">Skrifstofa</string>
+    <string name="poi_consulate_filter">Ræðismaður</string>
+    <string name="poi_consulate_consulate_general">Ræðismannsskrifstofa</string>
+    <string name="poi_embassy_nunciature">Sendinefnd Vatíkansins (nunciature)</string>
+    <string name="poi_consulate_honorary_consul">Heiðursræðismaður</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Borgaraþjónustur</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Vegabréfsáritun fyrir ekki-innflytjendur</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">Nei</string>
+    <string name="poi_liaison_representative_office">Umboðsskrifstofa</string>
+    <string name="poi_embassy_yes">Sendiherra í forsvari</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">Já</string>
+    <string name="poi_embassy_interests_section">Hagsmunadeild</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Já</string>
+    <string name="poi_embassy_high_commission">Sendifulltrúi</string>
+    <string name="poi_embassy_filter">Sendiráð</string>
+    <string name="poi_embassy_delegation">Sendinefnd</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">Nei</string>
+    <string name="poi_consulate_yes">Ræðismaður í forsvari</string>
+    <string name="poi_consulate_consular_agency">Ræðismannastofnun</string>
+    <string name="poi_embassy_branch_embassy">Útibú</string>
+    <string name="poi_consulate_consular_office">Ræðisskrifstofa</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index 8af3d89837..b0f780c060 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -52,7 +52,7 @@
     <string name="shared_string_move_down">Færa ↓</string>
     <string name="storage_directory_shared">Samnýtt minni</string>
     <string name="recalculate_route">Endurreikna leið</string>
-    <string name="donations">Gjafir</string>
+    <string name="donations">Styrkir</string>
     <string name="osm_live_subscribe_btn">Gerast áskrifandi</string>
     <string name="osm_live_active">Virkt</string>
     <string name="osm_live_not_active">Óvirkt</string>
@@ -131,7 +131,7 @@
     <string name="rendering_value_green_name">Grænt</string>
     <string name="rendering_value_lightblue_name">Ljósblátt</string>
     <string name="rendering_value_blue_name">Blátt</string>
-    <string name="rendering_value_purple_name">Fjólublátt</string>
+    <string name="rendering_value_purple_name">Purpurablátt</string>
     <string name="rendering_value_pink_name">Bleikt</string>
     <string name="rendering_value_brown_name">Brúnt</string>
     <string name="light_theme">Ljóst</string>
@@ -229,7 +229,7 @@
     <string name="shared_string_do_not_show_again">Ekki sýna aftur</string>
     <string name="shared_string_remember_my_choice">Muna valið</string>
     <string name="shared_string_refresh">Endurnýja</string>
-    <string name="shared_string_download">Hlaða niður</string>
+    <string name="shared_string_download">Sækja</string>
     <string name="shared_string_downloading">Sæki…</string>
     <string name="shared_string_action_template">Aðgerð {0}</string>
     <string name="shared_string_close">Loka</string>
@@ -238,7 +238,7 @@
     <string name="shared_string_show_all">Sýna allt</string>
     <string name="shared_string_collapse">Fella saman</string>
     <string name="shared_string_show_on_map">Birta á korti</string>
-    <string name="shared_string_map">Landakort</string>
+    <string name="shared_string_map">Kort</string>
     <string name="shared_string_favorite">Eftirlæti</string>
     <string name="shared_string_favorites">Eftirlæti</string>
     <string name="shared_string_address">Heimilisfang</string>
@@ -293,8 +293,8 @@
     <string name="shared_string_all">Allt</string>
     <string name="shared_string_waypoints">Ferilpunktar</string>
     <string name="rendering_value_browse_map_name">Fletta korti</string>
-    <string name="rendering_value_car_name">Bíll</string>
-    <string name="rendering_value_bicycle_name">Reiðhjól</string>
+    <string name="rendering_value_car_name">Akandi</string>
+    <string name="rendering_value_bicycle_name">Hjólandi</string>
     <string name="rendering_value_pedestrian_name">Fótgangandi</string>
     <string name="keep_navigation_service">Halda</string>
     <string name="lang_sw">Svahílí</string>
@@ -519,7 +519,7 @@
     <string name="arrival_distance_factor_at_last">Á síðustu metrunum</string>
     <string name="local_openstreetmap_uploading">Sendi inn…</string>
     <string name="index_name_north_america">Norður-Ameríka</string>
-    <string name="index_name_central_america">Mið-Ameríka</string>
+    <string name="index_name_central_america">MIð-Ameríka</string>
     <string name="index_name_south_america">Suður-Ameríka</string>
     <string name="index_name_europe">Evrópa</string>
     <string name="index_name_russia">Rússland</string>
@@ -553,7 +553,7 @@
     <string name="shared_string_release">Útgefið</string>
     <string name="local_index_mi_restore">Virkja</string>
     <string name="local_index_mi_backup">Gera óvirkt</string>
-    <string name="local_indexes_cat_backup">Aftengt</string>
+    <string name="local_indexes_cat_backup">Afvirkjað</string>
     <string name="search_offline_clear_search">Ný leit</string>
     <string name="tts_language_not_supported_title">Tungumálið er ekki stutt</string>
     <string name="system_locale">Kerfi</string>
@@ -649,7 +649,7 @@
     <string name="poi_action_add">bæta við</string>
     <string name="poi_action_change">breyta</string>
     <string name="poi_action_delete">eyða</string>
-    <string name="poi_dialog_opening_hours">Opna</string>
+    <string name="poi_dialog_opening_hours">Opið</string>
     <string name="poi_dialog_comment">Athugasemd</string>
     <string name="poi_dialog_reopen">Enduropna</string>
     <string name="default_buttons_commit">Senda</string>
@@ -858,7 +858,7 @@
     <string name="base_world_map">Grunnkort af heiminum</string>
     <string name="local_index_tile_data_expire">Rennur út (mínútur): %1$s</string>
     <string name="edit_tilesource_expiration_time">Rennur út (mínútur)</string>
-    <string name="edit_tilesource_url_to_load">Slóð (URL)</string>
+    <string name="edit_tilesource_url_to_load">Slóð</string>
     <string name="distance_measurement_finish_subtrack">Byrja nýjan undirferil</string>
     <string name="shared_location">Deild staðsetning</string>
     <string name="rendering_attr_noPolygons_name">Flákar</string>
@@ -968,7 +968,7 @@
     <string name="only_show">Birta leið</string>
     <string name="follow">Hefja leiðsögn</string>
     <string name="mark_final_location_first">Stilltu fyrst áfangastað</string>
-    <string name="get_directions">Leiðir</string>
+    <string name="get_directions">Leiðarlýsingar</string>
     <string name="opening_hours">Opnunartímar</string>
     <string name="loading_streets_buildings">Hleð inn götum/byggingum…</string>
     <string name="loading_postcodes">Hleð inn póstnúmerum…</string>
@@ -1023,7 +1023,7 @@
     <string name="enter_country_name">Settu heiti lands</string>
     <string name="map_viewing_item">Skoðun korts</string>
     <string name="techical_articles_item">Tæknilegar greinar</string>
-    <string name="map_legend">Kortaskýring</string>
+    <string name="map_legend">Skýringar á korti</string>
     <string name="dashboard_or_drawer_title">Stjórnborð eða valmyndastýring</string>
     <string name="only_download_over_wifi">Einungis hlaða niður yfir WiFi-net</string>
     <string name="missing_write_external_storage_permission">OsmAnd hefur ekki heimildir til að nota SD-kortið</string>
@@ -1165,7 +1165,7 @@
     <string name="open_street_map_login_and_pass">Notandanafn og lykilorð á OSM</string>
     <string name="map_markers">Kortamerki</string>
     <string name="map_marker">Kortamerki</string>
-    <string name="map_downloaded">Náð í kort</string>
+    <string name="map_downloaded">Búið að ná í kort</string>
     <string name="share_geo">geo:</string>
     <string name="record_plugin_name">Skráning ferðar</string>
     <string name="srtm_plugin_name">Hæðarlínur</string>
@@ -1622,7 +1622,7 @@
     <string name="rotate_map_to_bearing_descr">Stefna korts miðað við skjá:</string>
     <string name="fav_imported_sucessfully">Innflutningur eftirlæta tókst</string>
     <string name="import_file_favourites">Vista gögn sem GPX-skrá eða flytja ferilpunkta inn í eftirlæti?</string>
-    <string name="transport_stops">biðstöðvar</string>
+    <string name="transport_stops">stoppmerki</string>
     <string name="transport_search_after">Næsta ferðaáætlun</string>
     <string name="transport_search_before">Fyrri ferðaáætlun</string>
     <string name="transport_stop_to_go_out">Veldu biðstöð þar sem farið er út</string>
@@ -1856,13 +1856,13 @@
     <string name="routing_attr_driving_style_balance_name">Jafnvægi</string>
     <string name="routing_attr_driving_style_safety_name">Velja frekar hjáleiðir</string>
     <string name="relief_smoothness_factor_descr">Kjörið landslag: slétt eða hæðótt.</string>
-    <string name="shared_string_slope">Brekka</string>
+    <string name="shared_string_slope">Halli</string>
     <string name="add_new_folder">Bæta við nýrri möppu</string>
     <string name="points_delete_multiple_succesful">Punkti/punktum eytt.</string>
     <string name="points_delete_multiple">Ertu viss um að þú viljir eyða %1$d punkt(i/um) \?</string>
     <string name="track_points_category_name">Vegpunktar, merkisstaðir, nefnd fyrirbæri</string>
     <string name="shared_string_gpx_track">Ferill</string>
-    <string name="max_speed">Mesti hraði</string>
+    <string name="max_speed">Hámarkshraði</string>
     <string name="average_speed">Meðalhraði</string>
     <string name="shared_string_time_moving">Tími á ferð</string>
     <string name="shared_string_time_span">Tímarammi</string>
@@ -2055,7 +2055,7 @@
     <string name="safe_mode_description">Keyra forritið í öryggisham (notar hægvirkari Android-kóða í stað þess innbyggða).</string>
     <string name="shared_string_add_photos">Bæta við ljósmyndum</string>
     <string name="restart_search">Byrja leit aftur</string>
-    <string name="increase_search_radius">Auka radíus leitar</string>
+    <string name="increase_search_radius">Stækka radíus leitar</string>
     <string name="nothing_found">Ekkert fannst</string>
     <string name="quick_action_showhide_osmbugs_title">Birta/fela OSM-minnispunkta</string>
     <string name="quick_action_osmbugs_show">Birta OSM-minnispunkta</string>
@@ -2116,7 +2116,7 @@
     <string name="import_gpx_failed_descr">Gat ekki flutt skrána inn. Vinsamlegast athugið hvort OsmAnd hafi réttindi til að lesa skrána þar sem hún er.</string>
     <string name="open_mapillary">Opna Mapillary</string>
     <string name="mapillary_widget">Mapillary græja</string>
-    <string name="mapillary">Mapillary götumyndir</string>
+    <string name="mapillary">Mapillary</string>
     <string name="mapillary_image">Mapillary-mynd</string>
     <string name="map_widget_ruler_control">Mælistika út frá miðju hrings</string>
     <string name="shared_string_permissions">Heimildir</string>
@@ -2125,7 +2125,7 @@
     <string name="hide_from_zoom_level">Fela frá og með aðdráttarstigi</string>
     <string name="shared_string_reload">Endurnýja</string>
     <string name="mapillary_menu_descr_tile_cache">Endurlesa kortaflísar til að sjá uppfærð gögn.</string>
-    <string name="mapillary_menu_title_tile_cache">Tiglaskyndiminni</string>
+    <string name="mapillary_menu_title_tile_cache">Kortaflísaskyndiminni</string>
     <string name="wrong_user_name">Rangt notandanafn</string>
     <string name="shared_string_to">Til</string>
     <string name="mapillary_menu_date_from">Frá</string>
@@ -2180,7 +2180,7 @@
     <string name="by_type">Eftir gerð</string>
     <string name="looking_for_tracks_with_waypoints">Leita að ferlum með ferilpunktum</string>
     <string name="shared_string_more_without_dots">Meira</string>
-    <string name="appearance_on_the_map">Framsetning á korti</string>
+    <string name="appearance_on_the_map">Framsetning á kortinu</string>
     <string name="shared_string_gpx_waypoints">Ferilpunktar í ferli</string>
     <string name="favourites_group">Flokkur eftirlæta</string>
     <string name="add_group">Bæta við hópi</string>
@@ -2685,7 +2685,7 @@
     <string name="rendering_attr_whiteWaterSports_name">Fljótasiglingar</string>
     <string name="clear_all_intermediates">Hreinsa út alla milliáfanga</string>
     <string name="select_waypoints_category_description">Þú getur bætt við öllum punktum ferilsins, eða valið aðskilda flokka.</string>
-    <string name="shared_string_total">Alls</string>
+    <string name="shared_string_total">Samtals</string>
     <string name="nothing_found_in_radius">Ekkert fannst:</string>
     <string name="waypoints_removed_from_map_markers">Punktar fjarlægðir úr kortamerkjum</string>
     <string name="shared_string_travel_guides">Ferðalög</string>
@@ -2784,7 +2784,7 @@
     <string name="coord_input_add_point">Bæta við punkti</string>
     <string name="coord_input_save_as_track">Vista sem feril</string>
     <string name="coord_input_save_as_track_descr">Þú bættir við %1$s punktum. Settu inn heitið á skránni og vistaðu.</string>
-    <string name="shared_string_world">Veröld</string>
+    <string name="shared_string_world">Heimurinn</string>
     <string name="point_deleted">Punkti %1$s eytt</string>
     <string name="release_3_1">"• Leiðsögn: Framvindustika lagfærð, hraðari víxl á upphafi og enda leiða 
 \n
@@ -3438,7 +3438,7 @@
     <string name="multimedia_notes_view_descr">OSM-minnispunktarnir þínir eru í %1$s.</string>
     <string name="video_notes">Minnispunktar myndskeiða</string>
     <string name="photo_notes">Minnispunktar ljósmynda</string>
-    <string name="accessibility_announce">Auglýsing</string>
+    <string name="accessibility_announce">Tilkynna</string>
     <string name="login_and_pass">Notandanafn og lykilorð</string>
     <string name="select_map_icon_descr">Táknmynd birtist við hvíld.</string>
     <string name="logcat_buffer_descr">Athugaðu og deildu nákvæmum atvikaskrám úr forritinu</string>
@@ -3452,7 +3452,7 @@
     <string name="monitoring_notification">Tilkynning</string>
     <string name="monitoring_min_speed">Lágmarkshraði</string>
     <string name="monitoring_min_accuracy">Lágmarksnákvæmni</string>
-    <string name="monitoring_min_distance">Minnsta hreyfing</string>
+    <string name="monitoring_min_distance">Lágmarkshreyfing</string>
     <string name="reset_plugin_to_default">Frumstilla stillingar viðbótar á sjálfgefin gildi</string>
     <string name="multimedia_rec_split_title">Uppskipting upptöku</string>
     <string name="multimedia_use_system_camera">Nota kerfisforrit</string>
@@ -3877,7 +3877,7 @@
     <string name="shared_string_gpx_route">Skrá leið í feril</string>
     <string name="select_another_track">Velja annan feril</string>
     <string name="save_track_to_gpx">Skrifa feril sjálfkrafa í GPX-skrá á meðan leiðsögn stendur</string>
-    <string name="what_is_new">Nýjungar</string>
+    <string name="what_is_new">Hvað er nýtt</string>
     <string name="simplified_track">Einfaldaður ferill</string>
     <string name="simplified_track_description">Aðeins leiðarlínan verður vistuð, ferilpunktunum verður eytt.</string>
     <string name="shared_string_file_name">Skráarheiti</string>
@@ -3905,10 +3905,10 @@
     <string name="complex_routing_descr">Tveggja-þátta leiðagerð fyrir bílaleiðsögn.</string>
     <string name="use_native_pt">Innbyggð þróun almenningssamgangna</string>
     <string name="use_native_pt_desc">Skipta yfir í Java (öruggt) útreikning fyrir almenningssamgöngur</string>
-    <string name="perform_oauth_authorization_description">Framkvæma OAuth-innskráningu til að nota osmedit-eiginleika</string>
+    <string name="perform_oauth_authorization_description">Skrá inn með OAuth til að nota osmedit-eiginleika</string>
     <string name="perform_oauth_authorization">Skrá inn í gegnum OAuth</string>
     <string name="clear_osm_token">Hreinsa OAuth-teikn OpenStreetMap</string>
-    <string name="osm_edit_logout_success">Útskráning tókst</string>
+    <string name="osm_edit_logout_success">Skráð út</string>
     <string name="number_of_gpx_files_selected_pattern">%s GPX-skrár valdar</string>
     <string name="disable_recording_once_app_killed_descrp">Mun setja GPX-skráningu í bið þegar forritið er drepið (slökkt á því í gegnum skjáinn fyrir nýleg forrit - bakgrunnsvísir OsmAnd hverfur þar með úr tilkynningastiku Android-kerfisins.)</string>
     <string name="save_global_track_interval_descr">Veldu millibil skráninga í almenna leiðarskráningu (virkjað með viðmótshlutanum \'Skráning ferðar\' á kortinu).</string>
@@ -3960,7 +3960,7 @@
     <string name="subscription_payment_issue_title">Það er vandamál með áskriftina þína. Smelltu á hnappinn til að fara í stillingar Google Play áskriftarinnar og laga þar greiðslumátann.</string>
     <string name="use_login_password">Nota notandanafn og lykilorð</string>
     <string name="login_open_street_map">Skrá inn á OpenStreetMap</string>
-    <string name="user_login">Innskrá</string>
+    <string name="user_login">Skrá inn</string>
     <string name="enter_text_separated">Settu inn merki aðskilin með kommu.</string>
     <string name="send_files_to_openstreetmap">Senda GPX-skrá til OpenStreetMap</string>
     <string name="subscription_expired_title">Áskrift að OsmAnd Live er útrunnin</string>
@@ -3991,4 +3991,26 @@
     <string name="register_on_openplacereviews_desc">Ljósmyndir eru í boði frá opna gagnaverkefninu OpenPlaceReviews.org. Til að geta sent inn myndir þarftu að skrá þig á vefsvæðinu.</string>
     <string name="osm_edit_comment_note">Gera athugasemd við OSM-minnispunkt</string>
     <string name="gpx_upload_trackable_visibility_descr">\"Rekjanlegt\" þýðir að ferillinn birtist ekki á neinum opinberum listum, en meðhöndlaðir ferilpunktar með tímamerkjum úr ferlinum (sem ekki er hægt að tengja beint við þig) munu birtast í gögnum sem eru sótt í gegnum opinbert GPS API-forritsviðmót.</string>
+    <string name="elevation_data">Þú getur notað hæðargögn til útreikninga á hækkun/lækkun í ferðunum þínum</string>
+    <string name="add_photos_descr">OsmAnd birtir ljósmyndir frá ýmsum þjónustum:
+\nOpenPlaceReviews - ljósmyndir POI-merkisstaða;
+\nMapillary - myndefni í götuhæð;
+\nWeb / Wikimedia - ljósmyndir POI-merkisstaða sem eru í gögnum OpenStreetMap.</string>
+    <string name="use_dev_url_descr">Skiptu yfir í að nota dev.openstreetmap.org í staðinn fyrir openstreetmap.org til að prófa innsendingu OSM-minnispunkta / POI-merkisstaða / GPX-ferla.</string>
+    <string name="lang_de_casual">Þýska (dagleg)</string>
+    <string name="use_dev_url">Nota dev.openstreetmap.org</string>
+    <string name="app_mode_light_aircraft">Létt flugfar</string>
+    <string name="add_to_mapillary">Bæta í Mapillary</string>
+    <string name="export_not_enough_space">Ekki er nægilegt pláss</string>
+    <string name="export_not_enough_space_descr">Tækið þitt er aðeins með %1$s laust. Losaðu um eitthvað minni eða afveldu atriði sem á að flytja út.</string>
+    <string name="add_to_opr">Bæta í OpenPlaceReviews</string>
+    <string name="file_size_needed_for_import">Nauðsynlegt fyrir innflutning</string>
+    <string name="select_items_for_import">Veldu atriði sem á að flytja inn.</string>
+    <string name="select_groups_for_import">Veldu hópa sem á að flytja inn.</string>
+    <string name="approximate_file_size">Áætluð skráarstærð</string>
+    <string name="shared_string_resources">Tilföng</string>
+    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
+    <string name="select_data_to_export">Veldu þau gögn sem á að flytja út í skrána.</string>
+    <string name="select_picture">Veldu mynd</string>
+    <string name="cannot_upload_image">Mistókst að senda inn mynd, reyndu aftur síðar</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index ea5752b771..0c9125eda0 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -2311,7 +2311,7 @@
     <string name="poi_surface_tartan">Tartan</string>
     <string name="poi_checkpoint_type">Tipo Checkpoint</string>
     <string name="poi_bowls">Ciotole</string>
-    <string name="poi_water_place_access">Accesso all\'acqua</string>
+    <string name="poi_water_place_access">Accesso al luogo dell\'acqua</string>
     <string name="poi_resort">Villaggio turistico</string>
     <string name="poi_recreation_ground">Terreno ricreativo</string>
     <string name="poi_cuisine_donut">Ciambella</string>
@@ -2820,4 +2820,176 @@
     <string name="poi_resource_beryl">Berillio</string>
     <string name="poi_shop_wholesale">Negozio all\'ingrosso</string>
     <string name="poi_psv_designated">Accesso PSV: riservato</string>
+    <string name="poi_historic_civilization_etruscan">Civiltà: etrusca (XII - VI sec. a.C.)</string>
+    <string name="poi_historic_civilization_nuragic">Civiltà: nuragica (XVIII sec. a.C. - II sec. d.C.)</string>
+    <string name="poi_historic_civilization_ancient_roman">Civiltà: antica romana (753 a.C. - 284 d.C.)</string>
+    <string name="poi_tomb_columbarium">Tipo: colombario</string>
+    <string name="poi_tomb_vault">Tipo: caveau</string>
+    <string name="poi_deaf_description">Descrizione per non udenti</string>
+    <string name="poi_product_charcoal">Prodotto: carbone</string>
+    <string name="poi_product_leather">Prodotto: pelle</string>
+    <string name="poi_product_quicklime">Prodotto: calce viva</string>
+    <string name="poi_kiln">Forno</string>
+    <string name="poi_theatre_genre_chamber_music">Musica da camera</string>
+    <string name="poi_theatre_genre_puppet">Burattino</string>
+    <string name="poi_theatre_genre_musical">Musical</string>
+    <string name="poi_social_facility_for_diseased">Malati</string>
+    <string name="poi_social_facility_for_underprivileged">Svantaggiati</string>
+    <string name="poi_social_facility_for_juvenile">Giovanile</string>
+    <string name="poi_social_facility_day_care">Assistenza diurna</string>
+    <string name="poi_social_facility_workshop">Officina</string>
+    <string name="poi_social_facility_ambulatory_care">Assistenza ambulatoriale</string>
+    <string name="poi_refugee_no">Rifugiati: no</string>
+    <string name="poi_refugee_yes">Servizi per i rifugiati</string>
+    <string name="poi_capacity_tents">Tende massime</string>
+    <string name="poi_impromptu_no">Improvviso: no</string>
+    <string name="poi_impromptu_yes">Improvviso: sì</string>
+    <string name="poi_castle_type_castrum">Tipo di castello: castrum</string>
+    <string name="poi_castle_type_defensive_stately">Tipo di castello: difensivo, maestoso</string>
+    <string name="poi_castle_type_kremlin">Tipo di castello: cremlino</string>
+    <string name="poi_castle_type_stately">Tipo di castello: signorile</string>
+    <string name="poi_clothes_fur">Pelliccia</string>
+    <string name="poi_surveillance_indoor">Sorveglianza: interna</string>
+    <string name="poi_crop_poultry">Allevamento: pollame</string>
+    <string name="poi_crop_hop">Coltivazione: luppolo</string>
+    <string name="poi_crop_barley">Coltivazione: orzo</string>
+    <string name="poi_crop_cereal">Coltivazione: cereali</string>
+    <string name="poi_crop_corn">Coltivazione: mais</string>
+    <string name="poi_publisher">Ufficio editoriale</string>
+    <string name="poi_cooperative">Ufficio cooperativo</string>
+    <string name="poi_consulting">Ufficio di consulenza</string>
+    <string name="poi_guide">Ufficio della guida</string>
+    <string name="poi_office_camping">Ufficio del campeggio</string>
+    <string name="poi_technical_monument">Monumento tecnico</string>
+    <string name="poi_industrial_port">Tipo: porto</string>
+    <string name="poi_training_language">Formazione: lingua</string>
+    <string name="poi_route_light_rail_ref">Binario leggero</string>
+    <string name="poi_route_share_taxi_ref">Condividi il taxi</string>
+    <string name="poi_bridge_movable_retractable">Tipo di ponte mobile: retrattile</string>
+    <string name="poi_bridge_movable_transporter">Tipo di ponte mobile: trasportatore</string>
+    <string name="poi_bridge_movable_submersible">Tipo di ponte mobile: sommergibile</string>
+    <string name="poi_bridge_movable_drawbridge">Tipo di ponte mobile: ponte levatoio</string>
+    <string name="poi_bridge_movable_bascule">Tipo di ponte mobile: basculante</string>
+    <string name="poi_bridge_type_movable">Tipo di ponte: mobile</string>
+    <string name="poi_bridge_structure_log">Struttura del ponte: trave</string>
+    <string name="poi_bridge_waterway">Ponte fluviale</string>
+    <string name="poi_tunnel_railway">Galleria ferroviaria</string>
+    <string name="poi_tunnel_car">Galleria stradale</string>
+    <string name="poi_architecture_postconstructivism">Architettura: postcostruttivismo</string>
+    <string name="poi_architecture_oldrussian">Architettura: oldrussian</string>
+    <string name="poi_architecture_art_nouveau">Architettura: art nouveau</string>
+    <string name="poi_architecture_umgebinde">Architettura: umgebinde</string>
+    <string name="poi_internet_access_type_service">Tipo di accesso a Internet: servizio</string>
+    <string name="poi_internet_access_type_wired">Cablata</string>
+    <string name="poi_shelter_type_abandoned">Tipo di riparo: abbandonato</string>
+    <string name="poi_shelter_type_tent">Tipo di riparo: tenda</string>
+    <string name="poi_shelter_type_field_shelter">Rifugio da campo</string>
+    <string name="poi_shelter_type_sun_shelter">Riparo dal sole</string>
+    <string name="poi_shelter_type_rock_shelter">Riparo in roccia</string>
+    <string name="poi_shelter_type_basic_hut">Capanna di base</string>
+    <string name="poi_shelter_type_lean_to">Capannone</string>
+    <string name="poi_palm">Palma</string>
+    <string name="poi_beach_shingle">Ghiaia</string>
+    <string name="poi_wetland_mud">Fango</string>
+    <string name="poi_wetland_tidalflat">Marea piatta</string>
+    <string name="poi_wetland_saltern">Salina</string>
+    <string name="poi_wetland_marsh">Palude</string>
+    <string name="poi_wetland_bog">Palude</string>
+    <string name="poi_resource_tuff">Tufo</string>
+    <string name="poi_resource_slate">Ardesia</string>
+    <string name="poi_resource_slate_iron_ore_copper">Ardesia;minerale di ferro;rame</string>
+    <string name="poi_resource_sandstone">Arenaria</string>
+    <string name="poi_resource_rutile">Rutilo</string>
+    <string name="poi_resource_ruby">Rubino</string>
+    <string name="poi_resource_iron_ore">Minerale di ferro</string>
+    <string name="poi_resource_clay">Argilla</string>
+    <string name="poi_resource_chromite">Cromite</string>
+    <string name="poi_resource_bismuth">Bismuto</string>
+    <string name="poi_resource_bauxite">Bauxite</string>
+    <string name="poi_resource_barite">Barite</string>
+    <string name="poi_resource_antimony">Antimonio</string>
+    <string name="poi_memorial_fassade_decoration">Decorazione della facciata</string>
+    <string name="poi_memorial_cross">A forma di croce</string>
+    <string name="poi_memorial_blue_plaque">Targa blu</string>
+    <string name="poi_memorial_bust">Busto</string>
+    <string name="poi_vending_toll">Pedaggio automatico</string>
+    <string name="poi_vending_parcel_mail_in">Invio di pacchi</string>
+    <string name="poi_vending_parcel_pickup_mail_in">Ritiro dei pacchi e consegna della posta</string>
+    <string name="poi_diet_pescetarian_yes">Pescetariano</string>
+    <string name="poi_diet_halal_no">Dieta halal: no</string>
+    <string name="poi_diet_halal_yes">Halal</string>
+    <string name="poi_diet_halal_only">Solo halal</string>
+    <string name="poi_diet_halal_filter_yes">Halal</string>
+    <string name="poi_events_venue">Sede degli eventi</string>
+    <string name="poi_payment_ep_cash_no">Bancomat (Geldkarte) non accettata</string>
+    <string name="poi_payment_ep_cash_yes">Bancomat (Geldkarte)</string>
+    <string name="poi_payment_account_cards_no">Non si accettano carte di credito</string>
+    <string name="poi_aerialway_bubble_no">Nessuna bolla</string>
+    <string name="poi_aerialway_bubble_yes">Bolla</string>
+    <string name="poi_piste_grooming_scooter">Scooter</string>
+    <string name="poi_logging">Registrazione</string>
+    <string name="poi_horse_riding">Equitazione</string>
+    <string name="poi_water_characteristic_mud">Fango</string>
+    <string name="poi_source_biomass">Fonte di energia: biomassa</string>
+    <string name="poi_deadlock">Deadlock</string>
+    <string name="poi_animal_shelter_wildlife">Fauna selvatica</string>
+    <string name="poi_trees_rubber">Gomma</string>
+    <string name="poi_trees_meadow_orchard">Frutteto di prato</string>
+    <string name="poi_leaf_type_broadleaved">Latifoglie</string>
+    <string name="poi_bicycle_parking_shed">Capannone</string>
+    <string name="poi_bicycle_parking_rack">Rack</string>
+    <string name="poi_bicycle_parking_wall_loops">Passanti a parete</string>
+    <string name="poi_bicycle_parking_stands">Stand</string>
+    <string name="poi_content_fodder">Contenuto: foraggio</string>
+    <string name="poi_content_crop">Contenuto: raccolto</string>
+    <string name="poi_content_wastewater">Contenuto: acque reflue</string>
+    <string name="poi_content_sewage">Contenuto: liquame</string>
+    <string name="poi_content_manure">Contenuto: letame</string>
+    <string name="poi_content_slurry">Contenuto: liquame</string>
+    <string name="poi_wiki_lang_mn">Wiki mongolo</string>
+    <string name="poi_wiki_lang_an">Wiki aragonese</string>
+    <string name="poi_wiki_lang_my">Wiki birmano</string>
+    <string name="poi_wiki_lang_lmo">Wiki lombardo</string>
+    <string name="poi_wiki_lang_pnb">Wiki punjabi</string>
+    <string name="poi_wiki_lang_sco">Wiki scozzese</string>
+    <string name="poi_wiki_lang_jv">Wiki giavanese</string>
+    <string name="poi_wiki_lang_tt">Wiki tartaro</string>
+    <string name="poi_wiki_lang_mg">Wiki malgascio</string>
+    <string name="poi_wiki_lang_oc">Wiki occitano</string>
+    <string name="poi_wiki_lang_ur">Wiki urdu</string>
+    <string name="poi_wiki_lang_ce">Wiki ceceno</string>
+    <string name="poi_wiki_lang_uz">Wiki uzbeko</string>
+    <string name="poi_wiki_lang_kk">Wiki kazako</string>
+    <string name="poi_wiki_lang_ta">Wiki tamil</string>
+    <string name="poi_wiki_lang_sh">Wiki serbo-croato</string>
+    <string name="poi_wiki_lang_os">Wiki osseto</string>
+    <string name="poi_wiki_lang_nv">Wiki navajo</string>
+    <string name="poi_wiki_lang_nds">Wiki basso sassone</string>
+    <string name="poi_wiki_lang_ku">Wiki curdo</string>
+    <string name="poi_wiki_lang_fa">Wiki farsi</string>
+    <string name="poi_wiki_lang_eu">Wiki basco</string>
+    <string name="poi_wiki_lang_eo">Wiki esperanto</string>
+    <string name="poi_wiki_lang_cy">Wiki gallese</string>
+    <string name="poi_wiki_lang_bs">Wiki bosniaco</string>
+    <string name="poi_wiki_lang_bpy">Wiki bishnupriya</string>
+    <string name="poi_wiki_lang_az">Wiki azero</string>
+    <string name="poi_wiki_lang_als">Wiki alsaziano</string>
+    <string name="poi_signal_station_warning">Stazione di segnale, avvertimento</string>
+    <string name="poi_signal_station_traffic">Stazione di segnale, traffico</string>
+    <string name="poi_radio_station">Stazione radio, seamark</string>
+    <string name="poi_pile">Mucchio</string>
+    <string name="poi_seamark_dyke">Diga di Seamark</string>
+    <string name="poi_buoy_installation">Boa di installazione</string>
+    <string name="poi_recycling_small_electrical_appliances">Piccoli elettrodomestici</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Servizi per il cittadino</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Visti per immigrati</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Visti per non immigrati</string>
+    <string name="poi_liaison_filter">Collegamento</string>
+    <string name="poi_consulate_filter">Consolato</string>
+    <string name="poi_embassy_filter">Ambasciata</string>
+    <string name="poi_departures_board">Tabellone delle partenze</string>
+    <string name="poi_drinking_water_refill">Ricarica di acqua potabile</string>
+    <string name="poi_traffic_signals_arrow">Freccia</string>
+    <string name="poi_traffic_signals_vibration">Vibrazione</string>
+    <string name="poi_fire_hydrant_pressure_filter">Pressione</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 513bce443a..4de19463c6 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -3928,7 +3928,7 @@ POIの更新は利用できません</string>
     <string name="message_you_need_add_two_points_to_show_graphs">少なくとも2つの地点を追加する必要があります</string>
     <string name="login_open_street_map">OpenStreetMapにログイン</string>
     <string name="login_open_street_map_org">OpenStreetMap.orgにログイン</string>
-    <string name="sign_in_with_open_street_map">OpenStreetMapに登録</string>
+    <string name="sign_in_with_open_street_map">OpenStreetMapにOAuthログイン</string>
     <string name="open_street_map_login_mode">変更をアップロードするには、ログインする必要があります。
 \n
 \n安全なOAuth方式を使用してログイン、または通常のユーザー名とパスワード方式が選択できます。</string>
@@ -3949,4 +3949,6 @@ POIの更新は利用できません</string>
     <string name="login_account">アカウント</string>
     <string name="message_graph_will_be_available_after_recalculation">ルートが再計算されるのを待ちます。
 \nグラフは再計算後に利用できるようになります。</string>
+    <string name="use_dev_url_descr">OSM通知/ POI / GPXのアップロードをテストする場合、openstreetmap.orgではなくdev.openstreetmap.orgを使用するよう切り替えます。</string>
+    <string name="use_dev_url">dev.openstreetmap.orgを使用</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index a52a317b33..42c3d92278 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -3880,4 +3880,7 @@
     <string name="poi_liaison_filter">Ligação</string>
     <string name="poi_consulate_filter">Consulado</string>
     <string name="poi_embassy_filter">Embaixada</string>
+    <string name="poi_siren">Sereia</string>
+    <string name="poi_nurse">Enfermaria</string>
+    <string name="poi_mobile_money_agent">Agente de dinheiro móvel</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 698a7c2e76..4b760b500b 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -3993,4 +3993,5 @@
     <string name="select_picture">Выбор изображения</string>
     <string name="app_mode_kayak">Каяк</string>
     <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
+    <string name="lang_de_casual">Немецкий (повседневный)</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index f58e0f4dc5..ccf77c483c 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -3876,4 +3876,7 @@
     <string name="poi_diplomatic_services_immigrant_visas_filter">Vistos pro immigrantes</string>
     <string name="poi_diplomatic_services_non_immigrant_visas_filter">Vistos pro no immigrantes</string>
     <string name="poi_liaison_filter">Ufìtziu de collegamentu</string>
+    <string name="poi_siren">Sirena</string>
+    <string name="poi_nurse">Infermieri</string>
+    <string name="poi_mobile_money_agent">Agente de denaru mòbile</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index 70d6d83d6b..3e8c064f97 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -3868,4 +3868,7 @@
     <string name="poi_diplomatic_embassy">Посольство</string>
     <string name="poi_consulate_filter">Консульство</string>
     <string name="poi_embassy_filter">Посольство</string>
+    <string name="poi_siren">Сирена</string>
+    <string name="poi_nurse">Медсестра</string>
+    <string name="poi_mobile_money_agent">Мобільний грошовий агент</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 083311b0c0..0ff79b64b8 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -3879,4 +3879,7 @@
     <string name="poi_liaison_filter">聯絡處</string>
     <string name="poi_consulate_filter">領事館</string>
     <string name="poi_embassy_filter">大使館</string>
+    <string name="poi_siren">警報器</string>
+    <string name="poi_nurse">護理師</string>
+    <string name="poi_mobile_money_agent">行動貨幣代理商</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 34a60ca216..7414ecc26f 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2655,7 +2655,7 @@
     <string name="files_limit">%1$d files left</string>
     <string name="available_downloads_left">%1$d files left to download</string>
     <string name="install_paid">Full version</string>
-    <string name="cancel_route">Dismiss route</string>
+    <string name="cancel_route">Dismiss route?</string>
     <string name="cancel_navigation">Stop navigation</string>
     <string name="clear_destination">Clear destination</string>
     <string name="download_using_mobile_internet">Not connected to Wi-Fi. Use current connection to the Internet to download?</string>
diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
index f319a878be..467ad76a0f 100644
--- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
+++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
@@ -19,7 +19,6 @@ import android.view.KeyEvent;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -55,8 +54,6 @@ import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.mapmarkers.MapMarkersHelper;
-import net.osmand.plus.mapmarkers.MapMarker;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.SQLiteTileSource;
@@ -68,6 +65,8 @@ import net.osmand.plus.helpers.ExternalApiHelper;
 import net.osmand.plus.helpers.LockHelper;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.other.IContextMenuButtonListener;
+import net.osmand.plus.mapmarkers.MapMarker;
+import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.myplaces.TrackBitmapDrawer;
 import net.osmand.plus.quickaction.QuickAction;
@@ -79,11 +78,11 @@ import net.osmand.plus.routing.RouteDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.routing.VoiceRouter;
 import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.plus.settings.backend.ExportSettingsType;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.settings.backend.backup.ProfileSettingsItem;
 import net.osmand.plus.settings.backend.backup.SettingsHelper;
-import net.osmand.plus.settings.backend.ExportSettingsType;
 import net.osmand.plus.settings.backend.backup.SettingsItem;
 import net.osmand.plus.views.OsmandMapLayer;
 import net.osmand.plus.views.OsmandMapTileView;
@@ -598,8 +597,7 @@ public class OsmandAidlApi {
 					final RoutingHelper routingHelper = app.getRoutingHelper();
 					boolean force = intent.getBooleanExtra(AIDL_FORCE, true);
 					if (routingHelper.isFollowingMode() && !force) {
-						AlertDialog dlg = mapActivity.getMapActions().stopNavigationActionConfirm();
-						dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {
+						mapActivity.getMapActions().stopNavigationActionConfirm(new DialogInterface.OnDismissListener() {
 
 							@Override
 							public void onDismiss(DialogInterface dialog) {
@@ -665,8 +663,7 @@ public class OsmandAidlApi {
 						final RoutingHelper routingHelper = app.getRoutingHelper();
 						boolean force = intent.getBooleanExtra(AIDL_FORCE, true);
 						if (routingHelper.isFollowingMode() && !force) {
-							AlertDialog dlg = mapActivity.getMapActions().stopNavigationActionConfirm();
-							dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {
+							mapActivity.getMapActions().stopNavigationActionConfirm(new DialogInterface.OnDismissListener() {
 
 								@Override
 								public void onDismiss(DialogInterface dialog) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 00bd656b63..0213268a05 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -3,6 +3,7 @@ package net.osmand.plus.activities;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -39,8 +40,6 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuAdapter.ItemClickListener;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.ContextMenuItem.ItemBuilder;
-import net.osmand.plus.mapmarkers.MapMarkersHelper;
-import net.osmand.plus.mapmarkers.MapMarker;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@@ -56,11 +55,14 @@ import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.liveupdates.OsmLiveActivity;
 import net.osmand.plus.mapcontextmenu.AdditionalActionsBottomSheetDialogFragment;
 import net.osmand.plus.mapcontextmenu.AdditionalActionsBottomSheetDialogFragment.ContextMenuItemClickListener;
+import net.osmand.plus.mapmarkers.MapMarker;
 import net.osmand.plus.mapmarkers.MapMarkersDialogFragment;
+import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.mapmarkers.MarkersPlanRouteContext;
 import net.osmand.plus.measurementtool.MeasurementToolFragment;
 import net.osmand.plus.measurementtool.StartPlanRouteBottomSheet;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.osmedit.dialogs.DismissRouteBottomSheetFragment;
 import net.osmand.plus.profiles.RoutingProfileDataObject;
 import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.routepreparationmenu.WaypointsFragment;
@@ -75,7 +77,6 @@ import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.layers.MapControlsLayer;
 import net.osmand.plus.wikipedia.WikipediaDialogFragment;
 import net.osmand.plus.wikivoyage.WikivoyageWelcomeDialogFragment;
-import net.osmand.plus.wikivoyage.data.TravelDbHelper;
 import net.osmand.plus.wikivoyage.data.TravelHelper;
 import net.osmand.plus.wikivoyage.explore.WikivoyageExploreActivity;
 import net.osmand.router.GeneralRouter;
@@ -1122,26 +1123,12 @@ public class MapActivityActions implements DialogProvider {
 		}
 	}
 
-	public AlertDialog stopNavigationActionConfirm() {
-		return stopNavigationActionConfirm(null);
+	public void stopNavigationActionConfirm(@Nullable OnDismissListener listener) {
+		stopNavigationActionConfirm(listener, null);
 	}
 
-	public AlertDialog stopNavigationActionConfirm(final Runnable onStopAction) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
-		// Stop the navigation
-		builder.setTitle(getString(R.string.cancel_route));
-		builder.setMessage(getString(R.string.stop_routing_confirm));
-		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				stopNavigationWithoutConfirm();
-				if (onStopAction != null) {
-					onStopAction.run();
-				}
-			}
-		});
-		builder.setNegativeButton(R.string.shared_string_no, null);
-		return builder.show();
+	public void stopNavigationActionConfirm(@Nullable OnDismissListener listener, @Nullable Runnable onStopAction) {
+		DismissRouteBottomSheetFragment.showInstance(mapActivity.getSupportFragmentManager(), listener, onStopAction);
 	}
 
 	public void whereAmIDialog() {
diff --git a/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
index 71192fafe6..05dbd85340 100644
--- a/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
@@ -315,7 +315,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 		}
 	}
 
-	boolean useVerticalButtons() {
+	protected boolean useVerticalButtons() {
 		Activity activity = requireActivity();
 		int rightBottomButtonTextId = getRightBottomButtonTextId();
 		if (getDismissButtonTextId() != DEFAULT_VALUE && rightBottomButtonTextId != DEFAULT_VALUE) {
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashNavigationFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashNavigationFragment.java
index db4ab19884..b7f359a3e4 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashNavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashNavigationFragment.java
@@ -11,7 +11,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
 
 import net.osmand.plus.R;
@@ -85,14 +84,13 @@ public class DashNavigationFragment extends DashBaseFragment {
 			
 			@Override
 			public void onClick(View v) {
-				AlertDialog dlg = map.getMapActions().stopNavigationActionConfirm();
-				dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {
-					
+				map.getMapActions().stopNavigationActionConfirm(new DialogInterface.OnDismissListener() {
+
 					@Override
 					public void onDismiss(DialogInterface dialog) {
 						setupNavigation();
 						DashWaypointsFragment f = dashboard.getFragmentByClass(DashWaypointsFragment.class);
-						if(f != null) {
+						if (f != null) {
 							f.onOpenDash();
 						}
 					}
diff --git a/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java
index c2b1c25591..c92438e850 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java
@@ -11,7 +11,6 @@ import android.os.ParcelFileDescriptor;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -293,8 +292,7 @@ public class ExternalApiHelper {
 
 					final RoutingHelper routingHelper = app.getRoutingHelper();
 					if (routingHelper.isFollowingMode() && !force) {
-						AlertDialog dlg = mapActivity.getMapActions().stopNavigationActionConfirm();
-						dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {
+						mapActivity.getMapActions().stopNavigationActionConfirm(new DialogInterface.OnDismissListener() {
 
 							@Override
 							public void onDismiss(DialogInterface dialog) {
@@ -353,8 +351,7 @@ public class ExternalApiHelper {
 
 						final RoutingHelper routingHelper = app.getRoutingHelper();
 						if (routingHelper.isFollowingMode() && !force) {
-							AlertDialog dlg = mapActivity.getMapActions().stopNavigationActionConfirm();
-							dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {
+							mapActivity.getMapActions().stopNavigationActionConfirm(new DialogInterface.OnDismissListener() {
 
 								@Override
 								public void onDismiss(DialogInterface dialog) {
@@ -667,8 +664,7 @@ public class ExternalApiHelper {
 					}
 					final RoutingHelper routingHelper = app.getRoutingHelper();
 					if (routingHelper.isFollowingMode() && !force) {
-						AlertDialog dlg = mapActivity.getMapActions().stopNavigationActionConfirm();
-						dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {
+						mapActivity.getMapActions().stopNavigationActionConfirm(new DialogInterface.OnDismissListener() {
 
 							@Override
 							public void onDismiss(DialogInterface dialog) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index a441c7607a..db5a66cdce 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -886,7 +886,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 					app.getTargetPointsHelper().updateRouteAndRefresh(true);
 					app.getRoutingHelper().recalculateRouteDueToSettingsChange();
 				} else {
-					mapActivity.getMapActions().stopNavigationActionConfirm(new Runnable() {
+					mapActivity.getMapActions().stopNavigationActionConfirm(null , new Runnable() {
 						@Override
 						public void run() {
 							MapActivity mapActivity = getMapActivity();
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DismissRouteBottomSheetFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DismissRouteBottomSheetFragment.java
new file mode 100644
index 0000000000..641cee51cc
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/DismissRouteBottomSheetFragment.java
@@ -0,0 +1,106 @@
+package net.osmand.plus.osmedit.dialogs;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
+import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities.DialogButtonType;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerSpaceItem;
+
+public class DismissRouteBottomSheetFragment extends MenuBottomSheetDialogFragment {
+
+	public static final String TAG = DismissRouteBottomSheetFragment.class.getSimpleName();
+
+	private Runnable onStopAction;
+	private OnDismissListener dismissListener;
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+		BaseBottomSheetItem descriptionItem = new BottomSheetItemWithDescription.Builder()
+				.setDescription(getString(R.string.stop_routing_confirm))
+				.setTitle(getString(R.string.cancel_route))
+				.setLayoutId(R.layout.bottom_sheet_item_list_title_with_descr)
+				.create();
+
+		items.add(descriptionItem);
+
+		int padding = getResources().getDimensionPixelSize(R.dimen.content_padding_small);
+		items.add(new DividerSpaceItem(requireContext(), padding));
+	}
+
+	@Override
+	protected boolean useVerticalButtons() {
+		return false;
+	}
+
+	@Override
+	protected int getDismissButtonTextId() {
+		return R.string.shared_string_cancel;
+	}
+
+	@Override
+	protected int getRightBottomButtonTextId() {
+		return R.string.shared_string_dismiss;
+	}
+
+	@Override
+	protected DialogButtonType getRightBottomButtonType() {
+		return DialogButtonType.PRIMARY;
+	}
+
+	@Override
+	public int getSecondDividerHeight() {
+		return getResources().getDimensionPixelSize(R.dimen.bottom_sheet_icon_margin);
+	}
+
+	@Override
+	protected void onRightBottomButtonClick() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			mapActivity.getMapActions().stopNavigationWithoutConfirm();
+		}
+		if (onStopAction != null) {
+			onStopAction.run();
+		}
+		dismiss();
+	}
+
+	@Override
+	public void onDismiss(@NonNull DialogInterface dialog) {
+		super.onDismiss(dialog);
+		FragmentActivity activity = getActivity();
+		if (activity != null && !activity.isChangingConfigurations() && dismissListener != null) {
+			dismissListener.onDismiss(dialog);
+		}
+	}
+
+	@Nullable
+	public MapActivity getMapActivity() {
+		Activity activity = getActivity();
+		if (activity instanceof MapActivity) {
+			return (MapActivity) activity;
+		}
+		return null;
+	}
+
+	public static void showInstance(@NonNull FragmentManager fragmentManager, @Nullable OnDismissListener listener, @Nullable Runnable onStopAction) {
+		if (!fragmentManager.isStateSaved()) {
+			DismissRouteBottomSheetFragment fragment = new DismissRouteBottomSheetFragment();
+			fragment.dismissListener = listener;
+			fragment.onStopAction = onStopAction;
+			fragment.setRetainInstance(true);
+			fragment.show(fragmentManager, TAG);
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
index 3ced930a17..f5d52366fe 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
@@ -379,6 +379,7 @@ public class ExportItemsBottomSheet extends MenuBottomSheetDialogFragment {
 				iconId = R.drawable.ic_action_photo_dark;
 			}
 			builder.setIcon(uiUtilities.getIcon(iconId, activeColorRes));
+			builder.setDescription(AndroidUtils.formatSize(app, size));
 		} else if (fileSubtype.isMap()
 				|| fileSubtype == FileSettingsItem.FileSubtype.TTS_VOICE
 				|| fileSubtype == FileSettingsItem.FileSubtype.VOICE) {
@@ -389,7 +390,7 @@ public class ExportItemsBottomSheet extends MenuBottomSheetDialogFragment {
 				String mapDescription = getMapDescription(file);
 				String formattedSize = AndroidUtils.formatSize(app, size);
 				if (mapDescription != null) {
-					builder.setDescription(getString(R.string.ltr_or_rtl_combine_via_star, mapDescription, formattedSize));
+					builder.setDescription(getString(R.string.ltr_or_rtl_combine_via_bold_point, mapDescription, formattedSize));
 				} else {
 					builder.setDescription(formattedSize);
 				}
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
index 9a24d0aba6..e7cc9b4466 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
@@ -339,7 +339,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	public void stopNavigation() {
 		mapRouteInfoMenu.hide();
 		if (mapActivity.getRoutingHelper().isFollowingMode()) {
-			mapActivity.getMapActions().stopNavigationActionConfirm();
+			mapActivity.getMapActions().stopNavigationActionConfirm(null);
 		} else {
 			mapActivity.getMapActions().stopNavigationWithoutConfirm();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
index 0b9398a908..9ccdc5f6c8 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import net.osmand.Collator;
+import net.osmand.CollatorStringMatcher;
 import net.osmand.GPXUtilities;
 import net.osmand.IndexConstants;
 import net.osmand.OsmAndCollator;
@@ -25,7 +26,9 @@ import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -34,7 +37,7 @@ import gnu.trove.map.TLongObjectMap;
 import gnu.trove.map.hash.TLongObjectHashMap;
 
 
-public class TravelObfHelper implements TravelHelper{
+public class TravelObfHelper implements TravelHelper {
 
 	private static final Log LOG = PlatformUtil.getLog(TravelObfHelper.class);
 
@@ -76,7 +79,8 @@ public class TravelObfHelper implements TravelHelper{
 		return localDataHelper;
 	}
 
-	/** TODO
+	/**
+	 * TODO
 	 * 1. implement regional travelbooks
 	 * 2. check settings for default?
 	 */
@@ -97,7 +101,7 @@ public class TravelObfHelper implements TravelHelper{
 		} else {
 			selectedTravelBook = null;
 		}
-		
+
 	}
 
 	/**
@@ -143,7 +147,82 @@ public class TravelObfHelper implements TravelHelper{
 	@NonNull
 	@Override
 	public List<WikivoyageSearchResult> search(String searchQuery) {
-		return null;
+		List<WikivoyageSearchResult> res = new ArrayList<>();
+		CollatorStringMatcher matcher = new CollatorStringMatcher(searchQuery,
+				CollatorStringMatcher.StringMatcherMode.CHECK_STARTS_FROM_SPACE);
+
+		for (TravelArticle article : popularArticles) {
+			if (checkArticleMatches(matcher, article)) {
+
+				WikivoyageSearchResult searchResult = convertArticleToSearchResult(article);
+				res.add(searchResult);
+			}
+		}
+		res = new ArrayList<>(groupSearchResultsByCityId(res));
+		sortSearchResults(searchQuery, res);
+		return res;
+	}
+
+	private WikivoyageSearchResult convertArticleToSearchResult(TravelArticle article) {
+		WikivoyageSearchResult searchResult = new WikivoyageSearchResult();
+		searchResult.articleTitles = new ArrayList<>(Collections.singletonList(article.title));
+		searchResult.isPartOf = new ArrayList<>(Collections.singletonList(article.isPartOf));
+		searchResult.imageTitle = article.imageTitle;
+		searchResult.langs = new ArrayList<>(Collections.singletonList(article.lang));
+		searchResult.tripId = article.tripId;
+		return searchResult;
+	}
+
+	private Collection<WikivoyageSearchResult> groupSearchResultsByCityId(List<WikivoyageSearchResult> res) {
+		String baseLng = application.getLanguage();
+		TLongObjectHashMap<WikivoyageSearchResult> wikivoyage = new TLongObjectHashMap<>();
+		for (WikivoyageSearchResult rs : res) {
+			WikivoyageSearchResult prev = wikivoyage.get(rs.tripId);
+			if (prev != null) {
+				int insInd = prev.langs.size();
+				if (rs.langs.get(0).equals(baseLng)) {
+					insInd = 0;
+				} else if (rs.langs.get(0).equals("en")) {
+					if (!prev.langs.get(0).equals(baseLng)) {
+						insInd = 0;
+					} else {
+						insInd = 1;
+					}
+				}
+				prev.articleTitles.add(insInd, rs.articleTitles.get(0));
+				prev.langs.add(insInd, rs.langs.get(0));
+				prev.isPartOf.add(insInd, rs.isPartOf.get(0));
+			} else {
+				wikivoyage.put(rs.tripId, rs);
+			}
+		}
+		return wikivoyage.valueCollection();
+	}
+
+	private void sortSearchResults(final String searchQuery, List<WikivoyageSearchResult> list) {
+		Collections.sort(list, new Comparator<WikivoyageSearchResult>() {
+			@Override
+			public int compare(WikivoyageSearchResult o1, WikivoyageSearchResult o2) {
+				boolean c1 = CollatorStringMatcher.cmatches(collator, searchQuery, o1.articleTitles.get(0),
+						CollatorStringMatcher.StringMatcherMode.CHECK_ONLY_STARTS_WITH);
+				boolean c2 = CollatorStringMatcher.cmatches(collator, searchQuery, o2.articleTitles.get(0),
+						CollatorStringMatcher.StringMatcherMode.CHECK_ONLY_STARTS_WITH);
+				if (c1 == c2) {
+					return collator.compare(o1.articleTitles.get(0), o2.articleTitles.get(0));
+				} else if (c1) {
+					return -1;
+				} else if (c2) {
+					return 1;
+				}
+				return 0;
+			}
+		});
+	}
+
+	private boolean checkArticleMatches(CollatorStringMatcher matcher, TravelArticle article) {
+		return matcher.matches(article.getTitle())
+				|| matcher.matches(article.getContent())
+				|| matcher.matches(article.getContentsJson());
 	}
 
 	@NonNull
@@ -281,14 +360,14 @@ public class TravelObfHelper implements TravelHelper{
 //		if (aa != null) {
 //			article = readArticle(aa, lang);
 //		}
-		return  article;
+		return article;
 	}
 
 	@Override
 	public TravelArticle getArticle(long resId, String lang) {
 		TravelArticle article = getArticleFromCache(resId, lang);
 		if (article != null) {
-			return  article;
+			return article;
 		}
 		String name = ""; //???
 		return getArticle(name, lang);
@@ -344,7 +423,7 @@ public class TravelObfHelper implements TravelHelper{
 	}
 
 
-    //TODO finish stub
+	//TODO finish stub
 	@Override
 	public ArrayList<String> getArticleLangs(long cityId) {
 		ArrayList<String> res = new ArrayList<>();