diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 7b40bba97e..41ea1f67bb 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1673,7 +1673,7 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
 	<string name="shared_string_ellipsis">…</string>
 	<string name="shared_string_selected">Ausgewählt</string>
 	<string name="shared_string_selected_lowercase">ausgewählt</string>
-	<string name="shared_string_is_open">Offen</string>
+	<string name="shared_string_is_open">Jetzt offen</string>
 
 	<string name="rendering_attr_hideHouseNumbers_name">Hausnummern</string>
 	<string name="application_dir_change_warning3">Soll OsmAnd auch die Datendateien an den neuen Ort kopieren?</string>
@@ -2175,4 +2175,5 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
  	<string name="app_mode_train">Zug</string>
     <string name="coords_format">Koordinatenformat</string>
     <string name="coords_format_descr">Format der geographischen Koordinaten</string>
+		<string name="shared_string_is_open_24_7">Offen 7x24h</string>
   	</resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 90a2c0a457..673023a265 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+	<string name="shared_string_is_open_24_7">Open 24/7</string>
     <string name="storage_directory_card">Memory card</string>
     <string name="coords_format">Coordinate format</string>
     <string name="coords_format_descr">Format for the geographical coordinates</string>
@@ -408,7 +409,7 @@
     <string name="shared_string_copy">Copy</string>
     <string name="filter_poi_hint">Filter by name</string>
     <string name="search_poi_category_hint">Type to search all</string>
-    <string name="shared_string_is_open">Open</string>
+    <string name="shared_string_is_open">Open now</string>
     <string name="rendering_attr_OSMMapperAssistant_name">OSM mapper assistant</string>
     <string name="agps_info">A-GPS info</string>
     <string name="shared_string_manage">Manage</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
index 18301f3506..397c73b382 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
@@ -361,8 +361,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 				return true;
 			}
 		});
-		addFilter(optionsMenu, getString(R.string.shared_string_is_open).toLowerCase());
-		addFilter(optionsMenu, "24/7");
+		addFilter(optionsMenu, getString(R.string.shared_string_is_open));
+		addFilter(optionsMenu, getString(R.string.shared_string_is_open_24_7));
 		Map<String, PoiType> poiAdditionals = f.getPoiAdditionals();
 		if(poiAdditionals != null) {
 			TreeMap<String, PoiType> adds = new TreeMap<String, PoiType>();
@@ -381,7 +381,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 	
 	private void addFilter(PopupMenu optionsMenu, final String value) {
 		IconsCache iconsCache = getMyApplication().getIconsCache();
-		MenuItem item = optionsMenu.getMenu().add(getString(R.string.search_poi_filter) + " " + value)
+		MenuItem item = optionsMenu.getMenu().add(getString(R.string.search_poi_filter) + ": " + value)
 				.setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_filter_dark));
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
@@ -389,7 +389,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 				if(searchFilterLayout.getVisibility() == View.GONE) {
 					searchFilterLayout.setVisibility(View.VISIBLE);
 				}
-				searchFilter.setText((searchFilter.getText().toString() + " " + value).trim());
+				searchFilter.setText((searchFilter.getText().toString() + " " + value.replace(' ', '_').toLowerCase()).trim());
 				return true;
 			}
 		});
diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
index 6dc100a867..d305b835cb 100644
--- a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
+++ b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
@@ -356,11 +356,11 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 	}
 	
 	public String getNameToken24H() {
-		return "24/7";
+		return app.getString(R.string.shared_string_is_open_24_7).replace(' ', '_').toLowerCase();
 	}
 	
 	public String getNameTokenOpen() {
-		return app.getString(R.string.shared_string_is_open);
+		return app.getString(R.string.shared_string_is_open).replace(' ', '_').toLowerCase();
 	}
 
 	private ResultMatcher<Amenity> wrapResultMatcher(final ResultMatcher<Amenity> matcher) {