diff --git a/src/components/ADempiere/Tab/tabMixin.js b/src/components/ADempiere/Tab/tabMixin.js
index acfe2be2..3b1f6951 100644
--- a/src/components/ADempiere/Tab/tabMixin.js
+++ b/src/components/ADempiere/Tab/tabMixin.js
@@ -82,7 +82,7 @@ export const tabMixin = {
           parentUuid: metadataTab.parentUuid,
           containerUuid: metadataTab.uuid,
           value: metadataTab.whereClause,
-          isBoolToString: true
+          isBooleanToString: true
         }).value
       }
     }
diff --git a/src/store/modules/ADempiere/browserControl.js b/src/store/modules/ADempiere/browserControl.js
index d9d41eb1..165c5604 100644
--- a/src/store/modules/ADempiere/browserControl.js
+++ b/src/store/modules/ADempiere/browserControl.js
@@ -37,7 +37,8 @@ const browserControl = {
       if (!isEmptyValue(parsedQuery) && parsedQuery.includes('@')) {
         parsedQuery = parseContext({
           containerUuid,
-          value: parsedQuery
+          value: parsedQuery,
+          isBooleanToString: true
         }).value
       }
 
@@ -45,7 +46,8 @@ const browserControl = {
       if (!isEmptyValue(parsedWhereClause) && parsedWhereClause.includes('@')) {
         parsedWhereClause = parseContext({
           containerUuid,
-          value: parsedWhereClause
+          value: parsedWhereClause,
+          isBooleanToString: true
         }).value
       }
 
diff --git a/src/store/modules/ADempiere/lookup.js b/src/store/modules/ADempiere/lookup.js
index 97149229..069df007 100644
--- a/src/store/modules/ADempiere/lookup.js
+++ b/src/store/modules/ADempiere/lookup.js
@@ -37,7 +37,8 @@ const lookup = {
         parsedDirectQuery = parseContext({
           parentUuid,
           containerUuid,
-          value: directQuery
+          value: directQuery,
+          isBooleanToString: true
         }).value
       }
 
@@ -85,10 +86,10 @@ const lookup = {
         parsedQuery = parseContext({
           parentUuid,
           containerUuid,
-          value: query
+          value: query,
+          isBooleanToString: true
         }).value
       }
-
       return getLookupList({
         tableName,
         query: parsedQuery
@@ -127,7 +128,8 @@ const lookup = {
         parsedDirectQuery = parseContext({
           parentUuid,
           containerUuid,
-          value: parsedDirectQuery
+          value: parsedDirectQuery,
+          isBooleanToString: true
         }).value
       }
       const lookupItem = state.lookupItem.filter(itemLookup => {
@@ -142,7 +144,8 @@ const lookup = {
         parsedQuery = parseContext({
           parentUuid: parentUuid,
           containerUuid: containerUuid,
-          value: parsedQuery
+          value: parsedQuery,
+          isBooleanToString: true
         }).value
       }
       const lookupList = state.lookupList.filter(itemLookup => {
@@ -169,7 +172,8 @@ const lookup = {
         parsedDirectQuery = parseContext({
           parentUuid,
           containerUuid,
-          value: parsedDirectQuery
+          value: parsedDirectQuery,
+          isBooleanToString: true
         }).value
       }
       const lookupItem = state.lookupItem.find(itemLookup => {
@@ -195,7 +199,8 @@ const lookup = {
         parsedQuery = parseContext({
           parentUuid,
           containerUuid,
-          value: parsedQuery
+          value: parsedQuery,
+          isBooleanToString: true
         }).value
       }
       const lookupList = state.lookupList.find(itemLookup => {
diff --git a/src/store/modules/ADempiere/windowControl.js b/src/store/modules/ADempiere/windowControl.js
index 19e78500..e1d44621 100644
--- a/src/store/modules/ADempiere/windowControl.js
+++ b/src/store/modules/ADempiere/windowControl.js
@@ -577,7 +577,8 @@ const windowControl = {
         parsedQuery = parseContext({
           parentUuid: parentUuid,
           containerUuid: containerUuid,
-          value: tab.query
+          value: tab.query,
+          isBooleanToString: true
         }).value
       }
 
@@ -586,7 +587,8 @@ const windowControl = {
         parsedWhereClause = parseContext({
           parentUuid: parentUuid,
           containerUuid: containerUuid,
-          value: tab.whereClause
+          value: tab.whereClause,
+          isBooleanToString: true
         }).value
       }
 
diff --git a/src/utils/ADempiere/contextUtils.js b/src/utils/ADempiere/contextUtils.js
index 3f78b4b5..9f194bd3 100644
--- a/src/utils/ADempiere/contextUtils.js
+++ b/src/utils/ADempiere/contextUtils.js
@@ -63,16 +63,17 @@ export function getParentFields({ displayLogic, mandatoryLogic, readOnlyLogic, d
  * @param {string} parentUuid: (REQUIRED from Window) UUID Window
  * @param {string} containerUuid: (REQUIRED) UUID Tab, Process, SmartBrowser, Report and Form
  * @param {string} columnName: (Optional if exists in value) Column name to search in context
- * @param {boolean} isBoolToString, convert boolean values to string
+ * @param {boolean} isBooleanToString, convert boolean values to string
  */
 export function parseContext({
   parentUuid,
   containerUuid,
   columnName,
   value,
-  isSQL = false
+  isSQL = false,
+  isBooleanToString = false
 }) {
-  const isBooleanToString = value.includes('@SQL=')
+  // const isBooleanToString = value.includes('@SQL=')
   let isError = false
   const errorsList = []
   value = String(value)