diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
index a5c63fa286..1618744af5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
@@ -439,11 +439,10 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 		} else if (filter != null && !isNameFinderFilter() && !isSearchByNameFilter()) {
 			title = R.string.search_POI_level_btn;
 			enabled = (taskAlreadyFinished || currentSearchTask.getStatus() != Status.RUNNING) && filter.isSearchFurtherAvailable();
-		} else if ((filter != null) && (searchPOILevel != null)) {
-			title = R.string.search_POI_level_btn;
-			enabled = (taskAlreadyFinished || currentSearchTask.getStatus() != Status.RUNNING) && filter.isSearchFurtherAvailable();
 		} else if (filter != null) {
-			title = R.string.search_button;
+			// TODO: for search-by-name case title initially needs to be search_button (even before typing a character) 
+			//title = R.string.search_button;
+			title = R.string.search_POI_level_btn;
 			enabled = (taskAlreadyFinished || currentSearchTask.getStatus() != Status.RUNNING) && filter.isSearchFurtherAvailable();
 		}
 		if (searchPOILevel != null) {