diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 52036380..463e5bd4 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -430,8 +430,11 @@ export default {
     },
 
     getDataFromApi() {
-      //console.log("getDataFromAPI::TOP");
       var vm = this;
+      if (vm.loading) {
+        return;
+      }
+      console.log("getDataFromAPI::TOP");
 
       //start with defaults
       var listOptions = {
@@ -446,11 +449,11 @@ export default {
         listOptions.Limit = itemsPerPage;
       }
 
-      //effective ListView
-      if (vm.listViewId != 0) {
-        //we have a listview id so there will be a temp cached listview
-        listOptions["DataFilterID"] = vm.dataFilterId;
-      }
+      // //effective ListView
+      // if (vm.listViewId != 0) {
+      //   //we have a listview id so there will be a temp cached listview
+      //   listOptions["DataFilterID"] = vm.dataFilterId;
+      // }
 
       vm.loading = true;
 
@@ -460,7 +463,8 @@ export default {
       //   "dataListKey": "string",
       //   "listView": "string"
       // }
-
+      console.log("GetDataFromAPI::ListView is:");
+      console.log(vm.listView);
       window.$gz.api
         .upsert(vm.apiBaseUrl, {
           offset: listOptions.Offset,
@@ -497,6 +501,8 @@ export default {
     initForm(vm).then(() => {
       //rehydrate last form settings
       loadFormSettings(vm);
+      vm.loading = false;
+      vm.getDataFromApi();
     });
   }
 };
diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 1903e2cd..14311c9b 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -437,10 +437,10 @@ export default {
     var vm = this;
     if (this.formState.dirty) {
       //Put in unsaved listview
-      //debugger;
+      debugger;
       var formSettings = window.$gz.form.getFormSettings(vm.formKey);
-      formSettings.saved.dataTable.unsavedListView = generateListViewFromEdited(
-        vm
+      formSettings.saved.dataTable.unsavedListView = JSON.stringify(
+        generateListViewFromEdited(vm)
       );
       formSettings.saved.dataTable.listViewId = -1;
       window.$gz.form.setFormSettings(vm.formKey, formSettings);
@@ -1128,7 +1128,9 @@ function setEffectiveListView(vm) {
 
   if (vm.listViewId == -1) {
     if (formSettings.saved.dataTable.unsavedListView != null) {
-      vm.effectiveListView = formSettings.saved.dataTable.unsavedListView;
+      vm.effectiveListView = JSON.parse(
+        formSettings.saved.dataTable.unsavedListView
+      );
       vm.obj.name = vm.lt("FilterUnsaved");
       return Promise.resolve();
     }