diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 24c09118..06f66c3a 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -767,8 +767,8 @@ function loadFormSettings(vm) {
     if (vm.listViewId == -1) {
       //-1 is code for unsaved list view
       //check if there is a local copy of a listview vm was edited but not saved
-      if (formSettings.saved.dataTable.editedListView != undefined) {
-        vm.listView = formSettings.saved.dataTable.editedListView;
+      if (formSettings.saved.dataTable.unsavedListView != undefined) {
+        vm.listView = formSettings.saved.dataTable.unsavedListView;
       } else {
         //listviewid is for unsaved but we have no unsaved so fix that up
         vm.listView = undefined;
diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 6503e357..a7e68b8d 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -434,16 +434,17 @@ export default {
   // },
   //unsaved changes are actually valid for this form so no need to warn
   beforeRouteLeave(to, from, next) {
-    //var vm = this;
+    var vm = this;
     if (this.formState.dirty) {
       //Put in unsaved listview
-      //get current settings
+      //debugger;
       var formSettings = window.$gz.form.getFormSettings(vm.formKey);
-      formSettings.saved.dataTable.editedListView = generateListViewFromEdited(
-        this
+      formSettings.saved.dataTable.unsavedListView = generateListViewFromEdited(
+        vm
       );
-
+      formSettings.saved.dataTable.listViewId = -1;
       window.$gz.form.setFormSettings(vm.formKey, formSettings);
+      next();
     } else {
       next();
     }
@@ -486,10 +487,7 @@ export default {
       dataListKey: undefined,
       formKey: undefined,
       fieldDefinitions: [],
-      effectiveListView: undefined,
-      editedListView: undefined,
-      editedName: "",
-      editedPublic: true,
+      effectiveListView: undefined,     
       concurrencyToken: undefined,
       pickLists: {
         dateFilterOperators: [],
@@ -1129,8 +1127,9 @@ function setEffectiveListView(vm) {
   var formSettings = window.$gz.form.getFormSettings(vm.formKey);
 
   if (vm.listViewId == -1) {
-    if (formSettings.saved.dataTable.editedListView != null) {
-      vm.effectiveListView = formSettings.saved.dataTable.editedListView;
+    debugger;
+    if (formSettings.saved.dataTable.unsavedListView != null) {
+      vm.effectiveListView = formSettings.saved.dataTable.unsavedListView;
       vm.obj.name = vm.lt("FilterUnsaved");
       return Promise.resolve();
     }
@@ -1404,10 +1403,10 @@ function generateListViewFromEdited(vm) {
       if (ev.filter.any) {
         f.any = true;
       }
-      for (var j = 0; j < e.filter.items; j++) {
+      for (var j = 0; j < ev.filter.items; j++) {
         f.items.push({
-          op: e.filter.items[j].op,
-          value: e.filter.items[j].value
+          op: ev.filter.items[j].op,
+          value: ev.filter.items[j].value
         });
       }
     }