diff --git a/pom.xml b/pom.xml
index 2e9b394b6a..f76600c324 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 
         <dependency.alfresco-repository.version>6.23</dependency.alfresco-repository.version>
         <dependency.alfresco-core.version>6.17</dependency.alfresco-core.version>
-        <dependency.alfresco-data-model.version>7.2</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>7.3-SNAPSHOT</dependency.alfresco-data-model.version>
 
         <dependency.alfresco-pdf-renderer.version>1.0</dependency.alfresco-pdf-renderer.version>
         <dependency.jackson.version>2.8.10</dependency.jackson.version>
diff --git a/src/main/resources/alfresco/public-rest-context.xml b/src/main/resources/alfresco/public-rest-context.xml
index 8936d28ecb..ae137544d7 100644
--- a/src/main/resources/alfresco/public-rest-context.xml
+++ b/src/main/resources/alfresco/public-rest-context.xml
@@ -991,6 +991,7 @@
         <property name="resultMapper" ref="searchapiResultMapper" />
         <property name="searchMapper" ref="searchapiSearchMapper" />
     </bean>
+    
 
     <bean id="searchapiStoreMapper" class="org.alfresco.rest.api.search.impl.StoreMapper" />
 
diff --git a/src/test/java/org/alfresco/rest/api/search/SerializerTestHelper.java b/src/test/java/org/alfresco/rest/api/search/SerializerTestHelper.java
index 7808f24637..a13ccebd38 100644
--- a/src/test/java/org/alfresco/rest/api/search/SerializerTestHelper.java
+++ b/src/test/java/org/alfresco/rest/api/search/SerializerTestHelper.java
@@ -1,6 +1,6 @@
-/*-
+/*
  * #%L
- * Alfresco Remote API
+ * Alfresco Repository
  * %%
  * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
@@ -127,4 +127,16 @@ public class SerializerTestHelper implements RequestReader
         });
         return out.toString();
     }
+    public <T> Object extractFromJson(String json, Class<?> clasz) throws IOException
+    {
+        Content content = mock(Content.class);
+        when(content.getReader()).thenReturn(new StringReader(json));
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getContent()).thenReturn(content);
+        return extractJsonContent(request, jsonHelper, clasz);
+    }
+    public Object searchSQLQueryFromJson(String query, Class<?> classz) throws IOException
+    {
+        return extractFromJson(query, classz);
+    }
 }