diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndex.java b/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndex.java
index f6685736d..cde59ce4c 100644
--- a/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndex.java
+++ b/spring-data-neo4j-rest/src/main/java/org/neo4j/rest/graphdb/index/RestIndex.java
@@ -8,7 +8,6 @@ import org.neo4j.rest.graphdb.JsonHelper;
 import org.neo4j.rest.graphdb.RestEntity;
 import org.neo4j.rest.graphdb.RestGraphDatabase;
 import org.neo4j.rest.graphdb.RestRequest;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import javax.ws.rs.core.Response;
 import java.util.Collection;
@@ -75,12 +74,12 @@ public abstract class RestIndex<T extends PropertyContainer> implements Index<T>
         restRequest.delete( indexPath( ));
     }
 
-    public org.neo4j.graphdb.index.IndexHits<T> get( String key, Object value ) {
+    public IndexHits<T> get( String key, Object value ) {
         return query( key, value );
     }
 
     public IndexHits<T> query( String key, Object value ) {
-        ClientResponse response = restRequest.get( indexPath( key, value ) );
+        ClientResponse response = restRequest.get( indexPath( key ) + "?query=" +  RestRequest.encode( value ) );
         if ( restRequest.statusIs( response, Response.Status.OK ) ) {
             Collection hits = (Collection) restRequest.toEntity( response );
             return new SimpleIndexHits<T>( hits, hits.size() );
@@ -91,7 +90,7 @@ public abstract class RestIndex<T extends PropertyContainer> implements Index<T>
 
     protected abstract T createEntity( Map<?, ?> item );
 
-    public org.neo4j.graphdb.index.IndexHits<T> query( Object value ) {
+    public IndexHits<T> query( Object value ) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/AbstractFinder.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/AbstractFinder.java
index 90bd5fe9d..c8d44c896 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/AbstractFinder.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/AbstractFinder.java
@@ -82,7 +82,7 @@ public abstract class AbstractFinder<S extends PropertyContainer, T extends Grap
     private IndexHits<S> getIndexHits(String indexName, String property, Object value) {
         if (value instanceof Number) {
             Number number = (Number) value;
-            return getIndex(indexName).query(createInclusiveRangeQuery(property, number,number));
+            return getIndex(indexName).query(property, createInclusiveRangeQuery(property, number,number));
         }
         return getIndex(indexName).get(property, value);
     }