diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java
index 4ca7d456eb..d0568c60d2 100644
--- a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java
@@ -194,7 +194,7 @@ public class PoiFiltersHelper {
 	}
 
 	public List<PoiUIFilter> getTopDefinedPoiFilters() {
-//		if (cacheTopStandardFilters == null) {
+		if (cacheTopStandardFilters == null) {
 			List<PoiUIFilter> top = new ArrayList<PoiUIFilter>();
 			// user defined
 			top.addAll(getUserDefinedPoiFilters());
@@ -209,7 +209,7 @@ public class PoiFiltersHelper {
 			}
 			Collections.sort(top);
 			cacheTopStandardFilters = top;
-//		}
+		}
 		List<PoiUIFilter> result = new ArrayList<PoiUIFilter>();
 		result.addAll(cacheTopStandardFilters);
 		result.add(getShowAllPOIFilter());
diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
index b174be24a9..b9431ef05d 100644
--- a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
+++ b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
@@ -585,7 +585,7 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 					acceptedTypes.put(category, null);
 				}
 			} else {
-				acceptedTypes.put(category, types.get(category));
+				acceptedTypes.put(category, (LinkedHashSet<String>) types.get(category).clone());
 			}
 		}
 	}