diff --git a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
index 5c7a138794..dbea3ebfbf 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
@@ -710,11 +710,12 @@ public class SearchCoreFactory {
 						List<PoiType> additionals = pt.getPoiAdditionals();
 						if (additionals != null) {
 							for (PoiType a : additionals) {
-								if (!a.isReference() && !results.contains(a)
-										&& (nm.matches(a.getEnTranslation())
-										|| nm.matches(a.getTranslation())
-										|| nm.matches(a.getSynonyms()))) {
-									results.add(a);
+								if (!a.isReference() && !results.contains(a)) {
+									String enTranslation = a.getEnTranslation().toLowerCase();
+									if (!"yes".equals(enTranslation) && !"no".equals(enTranslation)
+											&& (nm.matches(enTranslation) || nm.matches(a.getTranslation()) || nm.matches(a.getSynonyms()))) {
+										results.add(a);
+									}
 								}
 							}
 						}
diff --git a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
index bcaf767092..7b3b6e4e4e 100644
--- a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
+++ b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
@@ -422,7 +422,7 @@ public class SQLiteTileSource implements ITileSource {
 		if (db == null || db.isReadOnly() || onlyReadonlyAvailable) {
 			return;
 		}
-		db.execSQL("TRUNCATE TABLE tiles");
+		db.execSQL("DELETE FROM tiles");
 	}
 	
 	/**