diff --git a/src/DataProvider.js b/src/DataProvider.js
index 61ef5fb1b..dfbefe9b7 100644
--- a/src/DataProvider.js
+++ b/src/DataProvider.js
@@ -193,7 +193,7 @@ export default {
    * @param {object} params
    * @returns {object}
    */
-  getDataSource(dataSourceId, params) {
+  getDataSource(dataSourceId, params, nonce = null) {
     // keep backwards compatibility
     if (
       !window.ProcessMaker.screen.cacheEnabled &&
@@ -210,7 +210,7 @@ export default {
         pmds_data: JSON.stringify(params.data)
       }
     }).then((response) => {
-      return response;
+      return [response, nonce];
     });
   },
 
@@ -266,7 +266,7 @@ export default {
   },
 
   getCollectionRecords(collectionId, options, nonce = null) {
-    options.useCache = window.ProcessMaker.screen.cacheEnabled;
+    options.useCache = window.ProcessMaker?.screen?.cacheEnabled;
 
     return this.get(
       `/collections/${collectionId}/records${this.authQueryString()}`,
diff --git a/src/components/inspector/options-list.vue b/src/components/inspector/options-list.vue
index 0ec21049c..bc10a60c6 100644
--- a/src/components/inspector/options-list.vue
+++ b/src/components/inspector/options-list.vue
@@ -227,7 +227,7 @@
 
     <div v-if="dataSource === dataSourceValues.dataConnector">
       <pmql-input
-        :search-type="'collections'"
+        :search-type="'collections_w_mustaches'"
         class="mb-1"
         :input-label="'PMQL'"
         v-model="pmqlQuery"