diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index f4e078d0..866df97e 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -7,10 +7,6 @@
 
 MISC ITEMS THAT CAME UP
 
-todo: is data-table function buildRecords(listData, columndefinitions, ridColumnOpenable)  being called twice every time??
-	Yes, fixed now but full of console.log statements to clean out, also should it be set in next tick everywhere?
-
-todo: column picker form, make not included columns not show the movement controls
 todo: if you change the filter the page should reset to 1 or else you get a weird scenario where it says page 5 but there is only one result page so it says no data
 todo: tagpicker, don't like how it works, it's funky to enter multiple tags and input doesn't go away when you select it just leaves the typed text there
 	once a selection is made it should not repeat the typed text again, it shoudl be ready to type another tag from start
diff --git a/ayanova/src/components/data-table.vue b/ayanova/src/components/data-table.vue
index 7a9a8710..ebda3778 100644
--- a/ayanova/src/components/data-table.vue
+++ b/ayanova/src/components/data-table.vue
@@ -412,6 +412,7 @@ export default {
       dataTablePagingOptions: {},
       lastDataTablePagingOptions: {},
       activeFilterId: 0, //<--0 signifies to select default as it's uninitialized
+      lastFetchFilterId: 0, //used to track change of filter and reset paging in getdata
       selectLists: {
         savedFilters: []
       },
@@ -722,6 +723,13 @@ export default {
         Offset: 0
       };
 
+      //has filter changed?
+      if (vm.lastFetchFilterId != vm.activeFilterId) {
+        //yes, go back to page one
+        vm.dataTablePagingOptions.page = 1;
+        vm.lastFetchFilterId = vm.activeFilterId;
+      }
+
       //calculate paging based on settings
       const { page, itemsPerPage } = vm.dataTablePagingOptions;
       if (itemsPerPage && itemsPerPage > 0) {
diff --git a/ayanova/src/views/ay-data-list-column-view.vue b/ayanova/src/views/ay-data-list-column-view.vue
index d99201b2..8767a460 100644
--- a/ayanova/src/views/ay-data-list-column-view.vue
+++ b/ayanova/src/views/ay-data-list-column-view.vue
@@ -26,7 +26,7 @@
                     {{ $ay.t("Include") }}
                   </div>
                   <!-- RE-ORDER CONTROL -->
-                  <div class="d-flex justify-space-between">
+                  <div class="d-flex justify-space-between" v-if="item.include">
                     <v-btn large icon @click="move('start', index)"
                       ><v-icon large data-cy="movestart"
                         >$ayiStepBackward</v-icon