diff --git a/src/components/ADempiere/Field/fieldContextInfo.vue b/src/components/ADempiere/Field/fieldPopovers/fieldContextInfo.vue
similarity index 100%
rename from src/components/ADempiere/Field/fieldContextInfo.vue
rename to src/components/ADempiere/Field/fieldPopovers/fieldContextInfo.vue
diff --git a/src/components/ADempiere/Field/fieldOperatorComparison.vue b/src/components/ADempiere/Field/fieldPopovers/fieldOperatorComparison.vue
similarity index 91%
rename from src/components/ADempiere/Field/fieldOperatorComparison.vue
rename to src/components/ADempiere/Field/fieldPopovers/fieldOperatorComparison.vue
index 10d4eb30..e232a97d 100644
--- a/src/components/ADempiere/Field/fieldOperatorComparison.vue
+++ b/src/components/ADempiere/Field/fieldPopovers/fieldOperatorComparison.vue
@@ -83,9 +83,9 @@ export default {
         panelType: this.fieldAttributes.panelType,
         columnName: this.fieldAttributes.columnName,
         newValue: value === 'NotSend' ? this.value : value,
-        isAdvancedQuery: this.fieldAttributes.isAdvancedQuery,
-        isSendToServer: !(value === 'NotSend' || this.fieldAttributes.isAdvancedQuery),
-        isSendCallout: !(value === 'NotSend' || this.fieldAttributes.isAdvancedQuery)
+        isAdvancedQuery: true,
+        isSendToServer: !(value === 'NotSend'),
+        isSendCallout: false
       }
 
       this.$store.dispatch('notifyFieldChange', {
diff --git a/src/components/ADempiere/Field/fieldTranslated.vue b/src/components/ADempiere/Field/fieldPopovers/fieldTranslated.vue
similarity index 100%
rename from src/components/ADempiere/Field/fieldTranslated.vue
rename to src/components/ADempiere/Field/fieldPopovers/fieldTranslated.vue
diff --git a/src/components/ADempiere/Field/index.vue b/src/components/ADempiere/Field/index.vue
index cd5f9f91..05e881ea 100644
--- a/src/components/ADempiere/Field/index.vue
+++ b/src/components/ADempiere/Field/index.vue
@@ -91,9 +91,9 @@
 </template>
 
 <script>
-import FieldContextInfo from '@/components/ADempiere/Field/fieldContextInfo'
-import FieldTranslated from '@/components/ADempiere/Field/fieldTranslated'
-import FieldOperatorComparison from '@/components/ADempiere/Field/fieldOperatorComparison'
+import FieldContextInfo from '@/components/ADempiere/Field/fieldPopovers/fieldContextInfo'
+import FieldOperatorComparison from '@/components/ADempiere/Field/fieldPopovers/fieldOperatorComparison'
+import FieldTranslated from '@/components/ADempiere/Field/fieldPopovers/fieldTranslated'
 import { FIELD_ONLY } from '@/components/ADempiere/Field/references'
 import { DEFAULT_SIZE } from '@/components/ADempiere/Field/fieldSize'
 import { fieldIsDisplayed } from '@/utils/ADempiere'
@@ -108,8 +108,8 @@ export default {
   name: 'FieldDefinition',
   components: {
     FieldContextInfo,
-    FieldTranslated,
-    FieldOperatorComparison
+    FieldOperatorComparison,
+    FieldTranslated
   },
   props: {
     parentUuid: {
@@ -300,7 +300,6 @@ export default {
     }
   },
   watch: {
-
     metadataField(value) {
       this.field = value
     }
@@ -354,8 +353,12 @@ export default {
     },
     isReadOnly() {
       if (this.isAdvancedQuery) {
+        if (['NULL', 'NOT_NULL'].includes(this.field.operator)) {
+          return true
+        }
         return false
       }
+
       if (!this.field.isActive) {
         return true
       }