diff --git a/ayanova/src/components/data-table.vue b/ayanova/src/components/data-table.vue
index 1dce3ef9..a67091d4 100644
--- a/ayanova/src/components/data-table.vue
+++ b/ayanova/src/components/data-table.vue
@@ -64,12 +64,6 @@
         >
           <!-- HEADER FILTERS: https://stackoverflow.com/a/58718975/8939 -->
           <template v-for="h in headers" v-slot:[`header.${h.value}`]>
-            <!-- <span :key="h.text">
-              <v-icon @click.stop="filter(h)" class="ml-n8 mr-1"
-                >$ayiFilter</v-icon
-              >
-              {{ h.text }}
-            </span> -->
             <span :key="h.text">
               <v-btn icon @click.stop="filter(h)" class="ml-n8 mr-1"
                 ><v-icon :color="filterColor(h)">$ayiFilter</v-icon></v-btn
@@ -391,6 +385,7 @@ export default {
       },
       headers: [],
       serverColumns: [],
+      serverFilter: [],
       totalRecords: 0,
       records: [],
       rowsPerPageItems: [5, 10, 25, 50, 100],
@@ -521,10 +516,9 @@ export default {
     },
     filterColor(item) {
       let clr = "disabled";
-      if (item.fk == "customername") {
+      if (this.serverFilter.findIndex(z => z.column == item.fk) > -1) {
         clr = "primary";
       }
-
       return clr;
     },
     keyArrayFromSortByArray(sortBy) {
@@ -722,9 +716,6 @@ export default {
       }
 
       try {
-        //untokenize ListView date token criteria (if there are any)
-        let untokenizedListView = untokenizeListView(vm.listView);
-
         let res = await window.$gz.api.upsert("data-list", {
           offset: listOptions.Offset,
           limit: listOptions.Limit,
@@ -742,6 +733,7 @@ export default {
         } else {
           //Save a copy of the server columns data for handling button clicks etc later
           vm.serverColumns = res.columns;
+          vm.serverFilter = res.filter;
           //Make sure the translation keys are fetched
           await fetchTranslatedHeaderNames(res.columns); //Note can use await here because it's wrapped inside an async function call, it will wait then resume next stuff below