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) {

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