diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index f2b9cc43df..a5ca8701d6 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -665,21 +665,21 @@ public class MapActivityActions implements DialogProvider {
 
 		//////////// Others
 		OsmandPlugin.registerOptionsMenu(mapActivity, optionsMenuHelper);
-		optionsMenuHelper.item(R.string.shared_string_exit).iconColor(R.drawable.ic_action_quit_dark )
-					.listen(new OnContextMenuClick() {
-			@Override
-			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-				// 1. Work for almost all cases when user open apps from main menu
-//				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getMapActivity());
-//				newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-//				// not exit
-//				newIntent.putExtra(AppInitializer.APP_EXIT_KEY, AppInitializer.APP_EXIT_CODE);
-//				mapActivity.startActivity(newIntent);
-				// In future when map will be main screen this should change
-				app.closeApplication(mapActivity);
-				return true;
-			}
-		}).reg();
+//		optionsMenuHelper.item(R.string.shared_string_exit).iconColor(R.drawable.ic_action_quit_dark )
+//					.listen(new OnContextMenuClick() {
+//			@Override
+//			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
+//				// 1. Work for almost all cases when user open apps from main menu
+////				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getMapActivity());
+////				newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+////				// not exit
+////				newIntent.putExtra(AppInitializer.APP_EXIT_KEY, AppInitializer.APP_EXIT_CODE);
+////				mapActivity.startActivity(newIntent);
+//				// In future when map will be main screen this should change
+//				app.closeApplication(mapActivity);
+//				return true;
+//			}
+//		}).reg();
 
 		getMyApplication().getAppCustomization().prepareOptionsMenu(mapActivity, optionsMenuHelper);
 		return optionsMenuHelper;
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
index c3445095e4..2f93068337 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
@@ -410,6 +410,9 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 			} else {
 				this.filter.updateTypesToAccept(custom);
 			}
+			filter.clearPreviousZoom();
+			// run query again
+			runNewSearchQuery(location, NEW_SEARCH_INIT);
 		}
 		if (filter == null || filter.isEmpty()) {
 			finish();