diff --git a/config/alfresco/subsystems/Search/solr/opencmis-context.xml b/config/alfresco/subsystems/Search/solr/opencmis-context.xml
index d354764c60..7649c3dd47 100644
--- a/config/alfresco/subsystems/Search/solr/opencmis-context.xml
+++ b/config/alfresco/subsystems/Search/solr/opencmis-context.xml
@@ -3,10 +3,21 @@
 
 <beans>
 
-
-    <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
-       
+   <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
+       <property name="cmisDictionaryService">
+            <ref bean="OpenCMISDictionaryService" />
+        </property>
+        <property name="nodeService">
+            <ref bean="nodeService" />
+        </property>
+        <property name="alfrescoDictionaryService">
+            <ref bean="dictionaryService" />
+        </property>
+        <property name="solrQueryLanguage">
+            <ref bean="search.lucene.sql.alfresco" />
+        </property>
     </bean>
+
     
     <bean id="search.lucene.sql.alfresco" class="org.alfresco.repo.search.impl.solr.SolrQueryLanguage"  >
 	    <property name="factories">
diff --git a/source/java/org/alfresco/cmis/CMISQueryOptions.java b/source/java/org/alfresco/cmis/CMISQueryOptions.java
index 8773fe1368..885114731d 100644
--- a/source/java/org/alfresco/cmis/CMISQueryOptions.java
+++ b/source/java/org/alfresco/cmis/CMISQueryOptions.java
@@ -25,6 +25,7 @@ import org.alfresco.repo.search.impl.querymodel.QueryOptions;
 import org.alfresco.repo.search.impl.querymodel.QueryOptions.Connective;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.LimitBy;
+import org.alfresco.service.cmr.search.QueryParameterDefinition;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 
@@ -141,7 +142,22 @@ public class CMISQueryOptions extends QueryOptions
         //searchParameters.setPermissionEvaluation()
         searchParameters.setQuery(this.getQuery());
         searchParameters.setSkipCount(this.getSkipCount());
-        
+        //searchParameters.addAllAttribute()
+        for(Locale locale : this.getLocales())
+        {
+            searchParameters.addLocale(locale);
+        }
+        for(QueryParameterDefinition queryParameterDefinition: this.getQueryParameterDefinitions())
+        {
+            searchParameters.addQueryParameterDefinition(queryParameterDefinition);
+        }
+        //searchParameters.addQueryTemplate(name, template)
+        //searchParameters.addSort()
+        for(StoreRef storeRef : this.getStores())
+        {
+            searchParameters.addStore(storeRef);
+        }
+        //searchParameters.addTextAttribute()
         return searchParameters;
     }
 }