diff --git a/OsmAnd-java/src/net/osmand/search/core/ObjectType.java b/OsmAnd-java/src/net/osmand/search/core/ObjectType.java
index 6a7b24f551..928573136b 100644
--- a/OsmAnd-java/src/net/osmand/search/core/ObjectType.java
+++ b/OsmAnd-java/src/net/osmand/search/core/ObjectType.java
@@ -1,10 +1,16 @@
 package net.osmand.search.core;
 
 public enum ObjectType {
-	CITY(true), VILLAGE(true), POSTCODE(true), STREET(true), HOUSE(true),
-	STREET_INTERSECTION(true), POI_TYPE(false), POI(true), LOCATION(true), PARTIAL_LOCATION(false), FAVORITE(true),
-	SEARCH_API_FINISHED(false),
-	REGION(true), RECENT_OBJ(true), WPT(true), UNKNOWN_NAME_FILTER(false);
+	// ADDRESS
+	CITY(true), VILLAGE(true), POSTCODE(true), STREET(true), HOUSE(true),STREET_INTERSECTION(true),
+	// POI
+	POI_TYPE(false), POI(true),
+	// LOCATION
+	LOCATION(true), PARTIAL_LOCATION(false),
+	// UI OBJECTS
+	FAVORITE(true), WPT(true), RECENT_OBJ(true), 
+	REGION(true), 
+	SEARCH_API_FINISHED(false), UNKNOWN_NAME_FILTER(false);
 	private boolean hasLocation;
 	private ObjectType(boolean location) {
 		this.hasLocation = location;
diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
index 7cf430de82..e989a70b5c 100644
--- a/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
+++ b/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
@@ -47,12 +47,9 @@ import com.jwetherell.openmap.common.UTMPoint;
 
 
 public class SearchCoreFactory {
-	// TODO partial location (+)
-	
 	// TODO add full text search with comma correct order
 	// TODO MED add full text search without comma and different word order
 	// TODO MED edit in the middle (with words and comma)?
-	
 	// TODO exclude duplicate streets/cities/pois...
 	
 	// TODO UI support poi additional select type and search
diff --git a/OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java b/OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java
index f79c6211ee..aff03fcfc9 100644
--- a/OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java
+++ b/OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java
@@ -47,7 +47,7 @@ public class AmenityIndexRepositoryBinary implements AmenityIndexRepository {
 
 	@Override
 	public boolean checkContainsInt(int top31, int left31, int bottom31, int right31) {
-		return index.containsPoiData(top31, left31, bottom31, right31);
+		return index.containsPoiData(left31, top31, right31, bottom31);
 	}