diff --git a/src/store/modules/ADempiere/panel/getters.js b/src/store/modules/ADempiere/panel/getters.js
index ef64629b..9825ffd2 100644
--- a/src/store/modules/ADempiere/panel/getters.js
+++ b/src/store/modules/ADempiere/panel/getters.js
@@ -102,8 +102,9 @@ const getters = {
       }
     })
 
-    if (!isEmptyValue(formatReturn)) {
+    if (formatReturn) {
       return fieldsNameEmpty.map(fieldItem => {
+        // fieldItem.name by default
         return fieldItem[formatReturn]
       })
     }
diff --git a/src/store/modules/ADempiere/windowControl/actions.js b/src/store/modules/ADempiere/windowControl/actions.js
index beae5b0a..509ee69f 100644
--- a/src/store/modules/ADempiere/windowControl/actions.js
+++ b/src/store/modules/ADempiere/windowControl/actions.js
@@ -842,20 +842,22 @@ export default {
       }).value
     }
 
-    if (isReference) {
-      if (!isEmptyValue(parsedWhereClause)) {
-        parsedWhereClause += ` AND ${referenceWhereClause}`
-      } else {
-        parsedWhereClause += referenceWhereClause
+    const addWhereClause = (currentWhereClause, newWhereClause) => {
+      if (isEmptyValue(currentWhereClause)) {
+        return newWhereClause
       }
+      if (isEmptyValue(newWhereClause)) {
+        return currentWhereClause
+      }
+      return `${currentWhereClause} AND ${newWhereClause}`
+    }
+
+    if (isReference) {
+      parsedWhereClause = addWhereClause(parsedWhereClause, referenceWhereClause)
     }
 
     if (!isEmptyValue(criteria)) {
-      if (!isEmptyValue(parsedWhereClause)) {
-        parsedWhereClause += ` AND ${criteria.whereClause}`
-      } else {
-        parsedWhereClause += criteria.whereClause
-      }
+      parsedWhereClause = addWhereClause(parsedWhereClause, criteria.whereClause)
     }
 
     const conditionsList = []