diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index c14552f9..3c7a6f46 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -908,6 +908,7 @@ BUILD 8.0.0-beta.1-rc3 CHANGES OF NOTE
 - Seeder, minor changes to ensure future work orders don't have labor or other things that don't make sense if future date
 - seeder now 10% of future wo have no scheduled users set to show off unscheduled widget
 - seeder no CSR generated in future
+- Fixed bug in data table filter controle when changing existing filter AND OR conditions radio buttons was not flagging as dirty so it could be saved
 
 
 
diff --git a/ayanova/src/api/dash-registry.js b/ayanova/src/api/dash-registry.js
index 2b9d5508..cbd6ce03 100644
--- a/ayanova/src/api/dash-registry.js
+++ b/ayanova/src/api/dash-registry.js
@@ -21,7 +21,9 @@ export default {
       settings: {
         customTitle: null,
         wotags: [],
-        woitemtags: []
+        wotagsany: true,
+        woitemtags: [],
+        woitemtagsany: true
       }
     },
     {
diff --git a/ayanova/src/components/dash-workorder-overdue-all-list.vue b/ayanova/src/components/dash-workorder-overdue-all-list.vue
index 181a6bdd..ae43dae8 100644
--- a/ayanova/src/components/dash-workorder-overdue-all-list.vue
+++ b/ayanova/src/components/dash-workorder-overdue-all-list.vue
@@ -49,20 +49,53 @@
             </v-card-title>
 
             <v-card-text>
+              <v-text-field
+                v-model="localSettings.customTitle"
+                class="mt-4"
+                :label="$ay.t('Name')"
+              ></v-text-field>
+
               <gz-tag-picker
                 v-model="localSettings.wotags"
+                class="mt-4"
                 :label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrder')"
               ></gz-tag-picker>
+              <v-radio-group
+                v-if="localSettings.wotags.length > 1"
+                v-model="localSettings.wotagsany"
+                row
+                class="mt-n3"
+              >
+                <v-radio
+                  :label="$ay.t('GridFilterDialogAndRadioText')"
+                  :value="false"
+                ></v-radio>
+                <v-radio
+                  :label="$ay.t('GridFilterDialogOrRadioText')"
+                  :value="true"
+                ></v-radio>
+              </v-radio-group>
 
               <gz-tag-picker
                 v-model="localSettings.woitemtags"
+                class="mt-4"
                 :label="$ay.t('Tags') + ' - ' + $ay.t('WorkOrderItem')"
               ></gz-tag-picker>
-
-              <v-text-field
-                v-model="localSettings.customTitle"
-                :label="$ay.t('Name')"
-              ></v-text-field>
+              <v-radio-group
+                v-if="localSettings.woitemtags.length > 1"
+                v-model="localSettings.woitemtagsany"
+                row
+                class="mt-n3"
+              >
+                <v-radio
+                  :label="$ay.t('GridFilterDialogAndRadioText')"
+                  :value="false"
+                ></v-radio>
+                <v-radio
+                  :label="$ay.t('GridFilterDialogOrRadioText')"
+                  :value="true"
+                ></v-radio>
+              </v-radio-group>
             </v-card-text>
 
             <v-divider></v-divider>
@@ -164,7 +197,9 @@ async function fetchTranslatedText() {
     "Name",
     "WorkOrder",
     "WorkOrderItem",
-    "NoData"
+    "NoData",
+    "GridFilterDialogAndRadioText",
+    "GridFilterDialogOrRadioText"
   ]);
 }
 </script>
diff --git a/ayanova/src/components/data-table-filter-control.vue b/ayanova/src/components/data-table-filter-control.vue
index 8b14213b..6094176e 100644
--- a/ayanova/src/components/data-table-filter-control.vue
+++ b/ayanova/src/components/data-table-filter-control.vue
@@ -317,7 +317,11 @@
               <v-list elevation="2">
                 <v-subheader v-if="editItem.filter.items.length > 1">
                   <!-- AND / OR FILTER CONDITIONS -->
-                  <v-radio-group v-model="editItem.filter.any" row>
+                  <v-radio-group
+                    v-model="editItem.filter.any"
+                    row
+                    @change="formState.dirty = true"
+                  >
                     <v-radio
                       :label="$ay.t('GridFilterDialogAndRadioText')"
                       :value="false"