diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 31920002..1c7696a4 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -9,8 +9,6 @@
 
 ## ROUGH SCHEDULE
 
-	GetLastReport is not implemented anywhere but is useful adn key
-		lastreport new icon or no icon or...??
 	Erase all data / generate data should maybe also erase all local cached browser data like ?reset ??
 		or maybe not, this is related to reports which I think don't clear in erasedatabase??
 
@@ -722,4 +720,5 @@ BUILD 130 CHANGES OF NOTE
 - About form: fixed bug that allowed customer / ho type user to view license info
 - Fixed picklist bug that could in rare circumstances (no tags but has variant type for specific purpose) result in error at the server due to trailing " and " clause in query
 - CustomerServiceRequest Customer / HeadOffice user interface: completed.  Customer user can create / view their csrs, headoffice user can create / view their customer's csrs
+- UI Menu all reportable pages: now have an additional menu option under Reports which is a quick access link to the most recent report used for that form on that browser
 
diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index 0a201b03..a682f227 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -217,7 +217,8 @@
                 </v-list-item-action>
                 <v-list-item-content>
                   <v-list-item-title>
-                    <span>{{ $ay.t(item.title) }}</span>
+                    <span v-if="item.notrans">{{ item.title }}</span>
+                    <span v-else>{{ $ay.t(item.title) }}</span>
                   </v-list-item-title>
                 </v-list-item-content>
               </v-list-item>
diff --git a/ayanova/src/components/data-table.vue b/ayanova/src/components/data-table.vue
index 1c86b9d5..7ffe2e96 100644
--- a/ayanova/src/components/data-table.vue
+++ b/ayanova/src/components/data-table.vue
@@ -1304,12 +1304,13 @@ function saveFormSettings(vm) {
   //preserve anything not directly related to datatable
   //for now it's just the last report so nothing fancy here
   let formSettings = window.$gz.form.getFormSettings(vm.formKey);
-  console.log("datatable-saveformsettings fetched is:", formSettings);
+
   if (formSettings != null && formSettings.saved != null) {
     if (formSettings.saved.lastReport != null) {
-      newFormSettings.lastReport = formSettings.saved.lastReport;
+      newFormSettings.saved.lastReport = formSettings.saved.lastReport;
     }
   }
+
   window.$gz.form.setFormSettings(vm.formKey, newFormSettings);
 }
 
diff --git a/ayanova/src/store.js b/ayanova/src/store.js
index 0f6064d5..3eafbddd 100644
--- a/ayanova/src/store.js
+++ b/ayanova/src/store.js
@@ -13,7 +13,7 @@ if (window.location.search) {
   var searchParams = new URLSearchParams(window.location.search);
   if (searchParams.has("reset")) {
     localStorage.removeItem("AyaNova");
-    console.log("RESET LOCAL SETTINGS");
+    console.log("LOCAL SETTINGS RESET");
   }
 }
 
@@ -185,7 +185,6 @@ export default new Vuex.Store({
       state.formSettings = {};
     },
     setFormSettings(state, data) {
-      console.log("Store::setformsettings", data);
       state.formSettings[data.formKey] = data.formSettings;
     },
     clearFormSettings(state, formKey) {
diff --git a/ayanova/src/views/acc-service-bank.vue b/ayanova/src/views/acc-service-bank.vue
index a73ae0b7..24397311 100644
--- a/ayanova/src/views/acc-service-bank.vue
+++ b/ayanova/src/views/acc-service-bank.vue
@@ -380,34 +380,18 @@ async function clickHandler(menuItem) {
         break;
 
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.ServiceBank }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.ServiceBank,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.ServiceBank }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
 
       default:
diff --git a/ayanova/src/views/acc-service-banks.vue b/ayanova/src/views/acc-service-banks.vue
index bf5d00f3..b06cfdad 100644
--- a/ayanova/src/views/acc-service-banks.vue
+++ b/ayanova/src/views/acc-service-banks.vue
@@ -126,37 +126,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.ServiceBank }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.ServiceBank
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.ServiceBank }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -207,6 +190,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/acc-service-rate.vue b/ayanova/src/views/acc-service-rate.vue
index 6a8540e5..f130d397 100644
--- a/ayanova/src/views/acc-service-rate.vue
+++ b/ayanova/src/views/acc-service-rate.vue
@@ -531,35 +531,20 @@ async function clickHandler(menuItem) {
       case "duplicate":
         m.vm.duplicate();
         break;
-      case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.ServiceRate }
-          });
-        } else {
-          //general report selector chosen
 
-          let res = await m.vm.$refs.reportSelector.open({
+      case "report":
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.ServiceRate,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.ServiceRate }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
 
       default:
@@ -624,6 +609,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/acc-service-rates.vue b/ayanova/src/views/acc-service-rates.vue
index 4545b7ce..74db3f09 100644
--- a/ayanova/src/views/acc-service-rates.vue
+++ b/ayanova/src/views/acc-service-rates.vue
@@ -73,37 +73,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.ServiceRate }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.ServiceRate
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.ServiceRate }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -152,6 +135,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/acc-tax-code.vue b/ayanova/src/views/acc-tax-code.vue
index 1320d0d6..13684ef4 100644
--- a/ayanova/src/views/acc-tax-code.vue
+++ b/ayanova/src/views/acc-tax-code.vue
@@ -502,34 +502,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.TaxCode }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.TaxCode,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.TaxCode }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
 
       default:
@@ -594,6 +578,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/acc-tax-codes.vue b/ayanova/src/views/acc-tax-codes.vue
index 6af21674..4ee20efa 100644
--- a/ayanova/src/views/acc-tax-codes.vue
+++ b/ayanova/src/views/acc-tax-codes.vue
@@ -71,35 +71,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.TaxCode }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.TaxCode)
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.TaxCode
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.TaxCode }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -148,6 +133,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/acc-travel-rate.vue b/ayanova/src/views/acc-travel-rate.vue
index 820e96c6..ef95a065 100644
--- a/ayanova/src/views/acc-travel-rate.vue
+++ b/ayanova/src/views/acc-travel-rate.vue
@@ -530,36 +530,19 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.TravelRate }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.TravelRate,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.TravelRate }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -622,6 +605,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/acc-travel-rates.vue b/ayanova/src/views/acc-travel-rates.vue
index 449bab2b..c84f0571 100644
--- a/ayanova/src/views/acc-travel-rates.vue
+++ b/ayanova/src/views/acc-travel-rates.vue
@@ -73,37 +73,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.TravelRate }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.TravelRate
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.TravelRate }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -152,6 +135,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index 68b9b47b..6a91a17f 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -299,6 +299,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue
index 292a69ed..45f78a55 100644
--- a/ayanova/src/views/adm-translation.vue
+++ b/ayanova/src/views/adm-translation.vue
@@ -516,31 +516,20 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Translation }
-          });
-        } else {
-          //general report selector chosen
-          let res = await m.vm.$refs.reportSelector.open();
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Translation }
-          });
+        let res = await m.vm.$refs.reportSelector.open(
+          {
+            AType: window.$gz.type.Translation,
+            selectedRowIds: [m.vm.obj.id]
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
+
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -607,6 +596,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 85baf6b9..805cefff 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -961,34 +961,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.User }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.User,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.User }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
 
       case "directnotify":
@@ -1091,6 +1075,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue
index 4f98b81f..8a59b867 100644
--- a/ayanova/src/views/adm-users.vue
+++ b/ayanova/src/views/adm-users.vue
@@ -71,32 +71,16 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.User }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.User }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "directnotify":
@@ -164,6 +148,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/cust-customer-note.vue b/ayanova/src/views/cust-customer-note.vue
index 6d4a81ab..7c987c8d 100644
--- a/ayanova/src/views/cust-customer-note.vue
+++ b/ayanova/src/views/cust-customer-note.vue
@@ -383,37 +383,21 @@ async function clickHandler(menuItem) {
           params: { recordid: 0 }
         });
         break;
-
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.CustomerNote }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.CustomerNote,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.CustomerNote }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
+
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -474,6 +458,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/cust-customer-notes.vue b/ayanova/src/views/cust-customer-notes.vue
index 0c39427a..4007a079 100644
--- a/ayanova/src/views/cust-customer-notes.vue
+++ b/ayanova/src/views/cust-customer-notes.vue
@@ -99,37 +99,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.CustomerNote }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.CustomerNote
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.CustomerNote }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -179,6 +162,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index ce1fdad5..21255a6f 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -1359,36 +1359,19 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Customer }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Customer,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Customer }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
-
       case "geoview":
         window.$gz.util.viewGeoLocation({
           latitude: m.vm.obj.latitude,
@@ -1508,6 +1491,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/cust-customers.vue b/ayanova/src/views/cust-customers.vue
index 4e9f6e43..f7fef128 100644
--- a/ayanova/src/views/cust-customers.vue
+++ b/ayanova/src/views/cust-customers.vue
@@ -103,37 +103,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Customer }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.Customer
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Customer }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -182,6 +165,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/cust-head-office.vue b/ayanova/src/views/cust-head-office.vue
index 1c65352b..9807df8f 100644
--- a/ayanova/src/views/cust-head-office.vue
+++ b/ayanova/src/views/cust-head-office.vue
@@ -1245,36 +1245,19 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.HeadOffice }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.HeadOffice,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.HeadOffice }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
-
       case "geoview":
         window.$gz.util.viewGeoLocation({
           latitude: m.vm.obj.latitude,
@@ -1358,6 +1341,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/cust-head-offices.vue b/ayanova/src/views/cust-head-offices.vue
index 7709786f..c9adcfba 100644
--- a/ayanova/src/views/cust-head-offices.vue
+++ b/ayanova/src/views/cust-head-offices.vue
@@ -73,37 +73,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.HeadOffice }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.HeadOffice
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.HeadOffice }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -152,6 +135,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 153ab966..5395d2b0 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -1004,34 +1004,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.User }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.User,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.User }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       case "directnotify":
         //nav to direct notify with list of users appended to route
@@ -1114,6 +1098,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue
index a2b04ef9..9299aec3 100644
--- a/ayanova/src/views/cust-users.vue
+++ b/ayanova/src/views/cust-users.vue
@@ -9,7 +9,7 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="cust-users"
+      form-key="contact-users"
       data-list-key="OutsideUserDataList"
       :show-select="rights.read"
       :reload="reload"
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-const FORM_KEY = "cust-users";
+const FORM_KEY = "contact-users";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.User);
@@ -71,32 +71,16 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.User }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.User }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "directnotify":
@@ -164,6 +148,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/customer-csr-edit.vue b/ayanova/src/views/customer-csr-edit.vue
index 6ab39104..874a40cf 100644
--- a/ayanova/src/views/customer-csr-edit.vue
+++ b/ayanova/src/views/customer-csr-edit.vue
@@ -265,7 +265,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-const FORM_KEY = "csr-edit";
+const FORM_KEY = "customer-csr-edit";
 const API_BASE_URL = "csr/";
 const FORM_CUSTOM_TEMPLATE_KEY = "CustomerServiceRequest"; //<-- Should always be CoreBizObject AyaType name here where possible
 
@@ -719,42 +719,20 @@ async function clickHandler(menuItem) {
       case "acceptnew":
         m.vm.accept(0);
         break;
-      case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.CustomerServiceRequest
-            }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
-            AType: window.$gz.type.CustomerServiceRequest,
-            selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.CustomerServiceRequest
-            }
-          });
-        }
-        break;
+      // case "report":
+      //   let res = await m.vm.$refs.reportSelector.open(
+      //     {
+      //       AType: window.$gz.type.CustomerServiceRequest,
+      //       selectedRowIds: [m.vm.obj.id]
+      //     },
+      //     m.id
+      //   );
+      //   if (res == null) {
+      //     return;
+      //   }
+      //   window.$gz.form.setLastReport(FORM_KEY, res);
+      //   generateMenu(m.vm);
+      //   break;
 
       default:
         window.$gz.eventBus.$emit(
@@ -823,6 +801,7 @@ function generateMenu(vm) {
   // if (lastReport != null) {
   //   menuOptions.menuItems.push({
   //     title: lastReport.name,
+  //    notrans: true,
   //     icon: "$ayiFileAlt",
   //     key: FORM_KEY + ":report:" + lastReport.id,
   //     vm: vm
diff --git a/ayanova/src/views/customer-csr.vue b/ayanova/src/views/customer-csr.vue
index bd1d942f..37318b89 100644
--- a/ayanova/src/views/customer-csr.vue
+++ b/ayanova/src/views/customer-csr.vue
@@ -73,43 +73,20 @@ async function clickHandler(menuItem) {
       //     m.vm.reload = !m.vm.reload;
       //   }
       //   break;
-      // case "report":
-      //   if (m.id != null) {
-      //     //last report selected is in m.id
-      //     m.vm.$router.push({
-      //       name: "ay-report",
-      //       params: {
-      //         recordid: m.id,
-      //         ayatype: window.$gz.type.CustomerServiceRequest
-      //       }
-      //     });
-      //   } else {
-      //     //general report selector chosen
-
+      //  case "report":
       //     let res = await m.vm.$refs.reportSelector.open(
-      //       m.vm.$refs.gzdatatable.getDataListSelection(
-      //         window.$gz.type.CustomerServiceRequest
-      //       )
+      //       {
+      //         AType: window.$gz.type.CustomerServiceRequest,
+      //         selectedRowIds: [m.vm.obj.id]
+      //       },
+      //       m.id
       //     );
-
-      //     //if null for no selection
-      //     //just bail out
       //     if (res == null) {
       //       return;
       //     }
-      //     //persist last report selected
       //     window.$gz.form.setLastReport(FORM_KEY, res);
-
-      //     //Now open the report viewer...
-      //     m.vm.$router.push({
-      //       name: "ay-report",
-      //       params: {
-      //         recordid: res.id,
-      //         ayatype: window.$gz.type.CustomerServiceRequest
-      //       }
-      //     });
-      //   }
-      //   break;
+      //     generateMenu(m.vm);
+      //     break;
 
       default:
         window.$gz.eventBus.$emit(
@@ -160,6 +137,7 @@ function generateMenu(vm) {
   // if (lastReport != null) {
   //   menuOptions.menuItems.push({
   //     title: lastReport.name,
+  //      notrans: true,
   //     icon: "$ayiFileAlt",
   //     key: FORM_KEY + ":report:" + lastReport.id,
   //     vm: vm
diff --git a/ayanova/src/views/home-memo.vue b/ayanova/src/views/home-memo.vue
index 50a0f345..46c2fe4c 100644
--- a/ayanova/src/views/home-memo.vue
+++ b/ayanova/src/views/home-memo.vue
@@ -551,36 +551,19 @@ async function clickHandler(menuItem) {
           name: "memo-edit",
           params: { recordid: 0 }
         });
-
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Memo }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Memo,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Memo }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       case "reply":
         m.vm.replyForward(false);
@@ -650,6 +633,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/home-memos.vue b/ayanova/src/views/home-memos.vue
index f6c053d1..0ae7ca74 100644
--- a/ayanova/src/views/home-memos.vue
+++ b/ayanova/src/views/home-memos.vue
@@ -71,35 +71,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Memo }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Memo)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Memo),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Memo }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -148,6 +131,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/home-notifications.vue b/ayanova/src/views/home-notifications.vue
index 1c0438ed..54780d14 100644
--- a/ayanova/src/views/home-notifications.vue
+++ b/ayanova/src/views/home-notifications.vue
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-const FORM_KEY = "notification-subscriptions";
+const FORM_KEY = "notifications";
 export default {
   async created() {
     let vm = this;
diff --git a/ayanova/src/views/home-notify-direct.vue b/ayanova/src/views/home-notify-direct.vue
index bf057042..9300cb01 100644
--- a/ayanova/src/views/home-notify-direct.vue
+++ b/ayanova/src/views/home-notify-direct.vue
@@ -52,7 +52,7 @@
 /*  Xeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const FORM_KEY = "home-notify-direct";
+const FORM_KEY = "notify-direct";
 
 export default {
   async created() {
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index 117970d8..86ae1de0 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -201,7 +201,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-const FORM_KEY = "home-notify-subscription";
+const FORM_KEY = "notify-subscription";
 const API_BASE_URL = "notify-subscription/";
 
 export default {
@@ -665,32 +665,20 @@ async function clickHandler(menuItem) {
       case "duplicate":
         m.vm.duplicate();
         break;
-      //   case "report":
-      //     if (m.id != null) {
-      //       //last report selected
-      //       m.vm.$router.push({
-      //         name: "ay-report",
-      //         params: { recordid: m.id, ayatype: window.$gz.type.NotifySubscription }
-      //       });
-      //     } else {
-      //       //general report selector chosen
-      //       let res = await m.vm.$refs.reportSelector.open();
-
-      //       //if null for no selection
-      //       //just bail out
-      //       if (res == null) {
-      //         return;
-      //       }
-      //       //persist last report selected
-      //       window.$gz.form.setLastReport(FORM_KEY, res);
-
-      //       //Now open the report viewer...
-      //       m.vm.$router.push({
-      //         name: "ay-report",
-      //         params: { recordid: res.id, ayatype: window.$gz.type.NotifySubscription }
-      //       });
-      //     }
-      //     break;
+      // case "report":
+      //   let res = await m.vm.$refs.reportSelector.open(
+      //     {
+      //       AType: window.$gz.type.NotifySubscription,
+      //       selectedRowIds: [m.vm.obj.id]
+      //     },
+      //     m.id
+      //   );
+      //   if (res == null) {
+      //     return;
+      //   }
+      //   window.$gz.form.setLastReport(FORM_KEY, res);
+      //   generateMenu(m.vm);
+      //   break;
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index e3c41339..28afa94c 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-const FORM_KEY = "notification-subscriptions";
+const FORM_KEY = "notify-subscriptions";
 export default {
   async created() {
     let vm = this;
diff --git a/ayanova/src/views/home-reminder.vue b/ayanova/src/views/home-reminder.vue
index d5ae0425..d39f977f 100644
--- a/ayanova/src/views/home-reminder.vue
+++ b/ayanova/src/views/home-reminder.vue
@@ -524,34 +524,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Reminder }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Reminder,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Reminder }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
 
       default:
@@ -615,6 +599,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/home-reminders.vue b/ayanova/src/views/home-reminders.vue
index 33d494b7..10381871 100644
--- a/ayanova/src/views/home-reminders.vue
+++ b/ayanova/src/views/home-reminders.vue
@@ -71,37 +71,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Reminder }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.Reminder
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Reminder }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -150,6 +133,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/home-review.vue b/ayanova/src/views/home-review.vue
index 5abf0db4..87dbb147 100644
--- a/ayanova/src/views/home-review.vue
+++ b/ayanova/src/views/home-review.vue
@@ -581,34 +581,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Review }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Review,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Review }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
 
       default:
@@ -674,6 +658,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/home-reviews.vue b/ayanova/src/views/home-reviews.vue
index e8f7b84d..24400ca9 100644
--- a/ayanova/src/views/home-reviews.vue
+++ b/ayanova/src/views/home-reviews.vue
@@ -121,35 +121,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Review }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Review)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Review),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Review }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -200,6 +183,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/home-search.vue b/ayanova/src/views/home-search.vue
index 49344494..6094b9d6 100644
--- a/ayanova/src/views/home-search.vue
+++ b/ayanova/src/views/home-search.vue
@@ -81,7 +81,7 @@
 /*  Xeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const FORM_KEY = "home-search";
+const FORM_KEY = "search";
 const API_BASE_URL = "search/";
 const FORM_CUSTOM_TEMPLATE_KEY = "home-search";
 const MAX_RESULTS = 200;
diff --git a/ayanova/src/views/home-security.vue b/ayanova/src/views/home-security.vue
index 660fd0ff..4806c466 100644
--- a/ayanova/src/views/home-security.vue
+++ b/ayanova/src/views/home-security.vue
@@ -68,7 +68,7 @@
 /*  Xeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const FORM_KEY = "home-security";
+const FORM_KEY = "security";
 const API_BASE_URL = "auth/";
 
 export default {
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index 5935f219..55c6681c 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -189,7 +189,7 @@ import EmailControl from "../components/email-control.vue";
 /*  Xeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const FORM_KEY = "home-user-settings";
+const FORM_KEY = "user-settings";
 const API_BASE_URL = "user-option/";
 const FORM_CUSTOM_TEMPLATE_KEY = "UserOptions"; //<- Should always be CoreBizObject AyaType name here
 
@@ -503,6 +503,7 @@ function generateMenu(vm) {
     data: "home-security",
     key: "app:nav:SECURITY"
   });
+
   menuOptions.menuItems.push({ divider: true, inset: false });
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
diff --git a/ayanova/src/views/inv-part-assemblies.vue b/ayanova/src/views/inv-part-assemblies.vue
index 9f00976e..ca1a99cd 100644
--- a/ayanova/src/views/inv-part-assemblies.vue
+++ b/ayanova/src/views/inv-part-assemblies.vue
@@ -73,37 +73,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PartAssembly }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartAssembly
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PartAssembly }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -152,6 +135,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-part-assembly.vue b/ayanova/src/views/inv-part-assembly.vue
index 14f50c46..6580f5ae 100644
--- a/ayanova/src/views/inv-part-assembly.vue
+++ b/ayanova/src/views/inv-part-assembly.vue
@@ -659,34 +659,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PartAssembly }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.PartAssembly,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PartAssembly }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
 
       default:
@@ -751,6 +735,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-part-inventory-transactions.vue b/ayanova/src/views/inv-part-inventory-transactions.vue
index d2c42a6d..fcf18866 100644
--- a/ayanova/src/views/inv-part-inventory-transactions.vue
+++ b/ayanova/src/views/inv-part-inventory-transactions.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-const FORM_KEY = "part-inventory-list";
+const FORM_KEY = "part-inventory-transaction-list";
 export default {
   created() {
     let vm = this;
@@ -121,37 +121,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PartInventory }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartInventory
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PartInventory }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -200,6 +183,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-part-inventory.vue b/ayanova/src/views/inv-part-inventory.vue
index 41ac5704..67261b65 100644
--- a/ayanova/src/views/inv-part-inventory.vue
+++ b/ayanova/src/views/inv-part-inventory.vue
@@ -110,43 +110,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PartInventoryDataList
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartInventoryDataList
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PartInventoryDataList
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -195,6 +172,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-part-requests.vue b/ayanova/src/views/inv-part-requests.vue
index c80d9f38..8f1a1ddc 100644
--- a/ayanova/src/views/inv-part-requests.vue
+++ b/ayanova/src/views/inv-part-requests.vue
@@ -106,43 +106,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PartInventoryRequestDataList
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartInventoryRequestDataList
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PartInventoryRequestDataList
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -181,6 +158,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-part-warehouse.vue b/ayanova/src/views/inv-part-warehouse.vue
index b1def8e5..97277f5d 100644
--- a/ayanova/src/views/inv-part-warehouse.vue
+++ b/ayanova/src/views/inv-part-warehouse.vue
@@ -101,7 +101,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-const FORM_KEY = "inv-part-warehouse";
+const FORM_KEY = "inv-part-warehouse-edit";
 const API_BASE_URL = "part-warehouse/";
 const FORM_CUSTOM_TEMPLATE_KEY = "PartWarehouse"; //<-- Should always be CoreBizObject AyaType name here where possible
 
@@ -441,34 +441,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PartWarehouse }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.PartWarehouse,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PartWarehouse }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       case "PartByWarehouseInventoryList":
         m.vm.$router.push({
@@ -565,6 +549,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-part-warehouses.vue b/ayanova/src/views/inv-part-warehouses.vue
index c8961832..2834be7c 100644
--- a/ayanova/src/views/inv-part-warehouses.vue
+++ b/ayanova/src/views/inv-part-warehouses.vue
@@ -9,7 +9,7 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="inv-part-warehouses"
+      form-key="inv-part-warehouse-list"
       data-list-key="PartWarehouseDataList"
       :show-select="rights.read"
       :reload="reload"
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-const FORM_KEY = "inv-part-warehouses";
+const FORM_KEY = "inv-part-warehouse-list";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.PartWarehouse);
@@ -73,37 +73,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PartWarehouse }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PartWarehouse
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PartWarehouse }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -152,6 +135,8 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-part.vue b/ayanova/src/views/inv-part.vue
index 2b33377e..a8226200 100644
--- a/ayanova/src/views/inv-part.vue
+++ b/ayanova/src/views/inv-part.vue
@@ -324,7 +324,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-const FORM_KEY = "inv-part";
+const FORM_KEY = "inv-part-edit";
 const API_BASE_URL = "part/";
 const FORM_CUSTOM_TEMPLATE_KEY = "Part"; //<-- Should always be CoreBizObject AyaType name here where possible
 
@@ -677,34 +677,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Part }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Part,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Part }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       case "PartSerialNumbersAvailable":
         m.vm.$router.push({
@@ -842,6 +826,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-parts.vue b/ayanova/src/views/inv-parts.vue
index 68d6e17a..0215f079 100644
--- a/ayanova/src/views/inv-parts.vue
+++ b/ayanova/src/views/inv-parts.vue
@@ -9,7 +9,7 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="part-list"
+      form-key="inv-part-list"
       data-list-key="PartDataList"
       :show-select="rights.read"
       :reload="reload"
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-const FORM_KEY = "part-list";
+const FORM_KEY = "inv-part-list";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.Part);
@@ -71,35 +71,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Part }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Part)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Part),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Part }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -148,6 +131,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index a269f92a..c8bf4a74 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -862,7 +862,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-const FORM_KEY = "inv-purchase-order";
+const FORM_KEY = "inv-purchase-order-edit";
 const API_BASE_URL = "purchase-order/";
 const FORM_CUSTOM_TEMPLATE_KEY = "PurchaseOrder"; //<-- Should always be CoreBizObject AyaType name here where possible
 
@@ -1816,36 +1816,19 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PurchaseOrder }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.PurchaseOrder,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PurchaseOrder }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -1908,6 +1891,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/inv-purchase-orders.vue b/ayanova/src/views/inv-purchase-orders.vue
index 5a65536b..ba16f3cf 100644
--- a/ayanova/src/views/inv-purchase-orders.vue
+++ b/ayanova/src/views/inv-purchase-orders.vue
@@ -9,7 +9,7 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="purchaseorder-list"
+      form-key="inv-purchaseorder-list"
       data-list-key="PurchaseOrderDataList"
       :show-select="rights.read"
       :reload="reload"
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-const FORM_KEY = "purchaseorder-list";
+const FORM_KEY = "inv-purchaseorder-list";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.PurchaseOrder);
@@ -73,37 +73,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PurchaseOrder }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PurchaseOrder
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PurchaseOrder }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -152,6 +135,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
index d551b478..eb34c5ae 100644
--- a/ayanova/src/views/svc-contract.vue
+++ b/ayanova/src/views/svc-contract.vue
@@ -1823,36 +1823,19 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Contract }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Contract,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Contract }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -1915,6 +1898,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-contracts.vue b/ayanova/src/views/svc-contracts.vue
index a2fefcb6..042f2972 100644
--- a/ayanova/src/views/svc-contracts.vue
+++ b/ayanova/src/views/svc-contracts.vue
@@ -71,37 +71,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Contract }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.Contract
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Contract }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -150,6 +133,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue
index da9fd8d5..0fe0c05e 100644
--- a/ayanova/src/views/svc-csr.vue
+++ b/ayanova/src/views/svc-csr.vue
@@ -756,42 +756,19 @@ async function clickHandler(menuItem) {
         m.vm.accept();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.CustomerServiceRequest
-            }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.CustomerServiceRequest,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.CustomerServiceRequest
-            }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -858,6 +835,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-csrs.vue b/ayanova/src/views/svc-csrs.vue
index 16c9bd5e..6f6a7857 100644
--- a/ayanova/src/views/svc-csrs.vue
+++ b/ayanova/src/views/svc-csrs.vue
@@ -75,43 +75,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.CustomerServiceRequest
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.CustomerServiceRequest
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.CustomerServiceRequest
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -160,6 +137,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-loaner.vue b/ayanova/src/views/svc-loaner.vue
index 41c75573..ddfb6f32 100644
--- a/ayanova/src/views/svc-loaner.vue
+++ b/ayanova/src/views/svc-loaner.vue
@@ -783,34 +783,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.LoanUnit }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.LoanUnit,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.LoanUnit }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       case "WorkOrderList":
         m.vm.$router.push({
@@ -904,6 +888,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-loaners.vue b/ayanova/src/views/svc-loaners.vue
index a12c9e6f..df22aea7 100644
--- a/ayanova/src/views/svc-loaners.vue
+++ b/ayanova/src/views/svc-loaners.vue
@@ -71,37 +71,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.LoanUnit }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.LoanUnit
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.LoanUnit }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -150,6 +133,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-meter-reading.vue b/ayanova/src/views/svc-meter-reading.vue
index 4829b5fc..774c353d 100644
--- a/ayanova/src/views/svc-meter-reading.vue
+++ b/ayanova/src/views/svc-meter-reading.vue
@@ -341,42 +341,19 @@ async function clickHandler(menuItem) {
           params: { recordid: 0, unitid: m.vm.obj.unitId }
         });
         break;
-
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.UnitMeterReading
-            }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.UnitMeterReading,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.UnitMeterReading
-            }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
@@ -428,6 +405,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-meter-readings.vue b/ayanova/src/views/svc-meter-readings.vue
index 0d2d6967..7737b7b5 100644
--- a/ayanova/src/views/svc-meter-readings.vue
+++ b/ayanova/src/views/svc-meter-readings.vue
@@ -82,45 +82,21 @@ async function clickHandler(menuItem) {
           }
         });
         break;
-
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.UnitMeterReading
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.UnitMeterReading
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.UnitMeterReading
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -170,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-item-expenses.vue b/ayanova/src/views/svc-pm-item-expenses.vue
index 3e099ddf..e3ea8c33 100644
--- a/ayanova/src/views/svc-pm-item-expenses.vue
+++ b/ayanova/src/views/svc-pm-item-expenses.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PMItemExpense
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemExpense
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PMItemExpense
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-item-labors.vue b/ayanova/src/views/svc-pm-item-labors.vue
index f37533f7..b7e5ffd5 100644
--- a/ayanova/src/views/svc-pm-item-labors.vue
+++ b/ayanova/src/views/svc-pm-item-labors.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PMItemLabor
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemLabor
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PMItemLabor
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-item-loans.vue b/ayanova/src/views/svc-pm-item-loans.vue
index 2f876b55..9646c6a1 100644
--- a/ayanova/src/views/svc-pm-item-loans.vue
+++ b/ayanova/src/views/svc-pm-item-loans.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PMItemLoan
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemLoan
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PMItemLoan
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-item-outside-services.vue b/ayanova/src/views/svc-pm-item-outside-services.vue
index 8c15f410..a1b0c6d4 100644
--- a/ayanova/src/views/svc-pm-item-outside-services.vue
+++ b/ayanova/src/views/svc-pm-item-outside-services.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PMItemOutsideService
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemOutsideService
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PMItemOutsideService
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-item-parts.vue b/ayanova/src/views/svc-pm-item-parts.vue
index 787f9487..50bd1382 100644
--- a/ayanova/src/views/svc-pm-item-parts.vue
+++ b/ayanova/src/views/svc-pm-item-parts.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PMItemPart
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemPart
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PMItemPart
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-item-scheduled-users.vue b/ayanova/src/views/svc-pm-item-scheduled-users.vue
index 6e156563..f2568a1a 100644
--- a/ayanova/src/views/svc-pm-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-pm-item-scheduled-users.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PMItemScheduledUser
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemScheduledUser
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PMItemScheduledUser
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-item-tasks.vue b/ayanova/src/views/svc-pm-item-tasks.vue
index e24e81b1..09cf3b25 100644
--- a/ayanova/src/views/svc-pm-item-tasks.vue
+++ b/ayanova/src/views/svc-pm-item-tasks.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PMItemTask
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemTask
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PMItemTask
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-item-travels.vue b/ayanova/src/views/svc-pm-item-travels.vue
index e5dd6bd0..d6bf6c19 100644
--- a/ayanova/src/views/svc-pm-item-travels.vue
+++ b/ayanova/src/views/svc-pm-item-travels.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PMItemTravel
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemTravel
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PMItemTravel
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-item-units.vue b/ayanova/src/views/svc-pm-item-units.vue
index 7aee4efc..eb55f217 100644
--- a/ayanova/src/views/svc-pm-item-units.vue
+++ b/ayanova/src/views/svc-pm-item-units.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.PMItemUnit
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.PMItemUnit
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.PMItemUnit
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm-items.vue b/ayanova/src/views/svc-pm-items.vue
index 58a6dde2..06e20c0f 100644
--- a/ayanova/src/views/svc-pm-items.vue
+++ b/ayanova/src/views/svc-pm-items.vue
@@ -71,32 +71,16 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PMItem }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PMItem)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PMItem),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PMItem }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "PMList":
@@ -203,6 +187,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pm.vue b/ayanova/src/views/svc-pm.vue
index f45b304c..e317e1b9 100644
--- a/ayanova/src/views/svc-pm.vue
+++ b/ayanova/src/views/svc-pm.vue
@@ -1705,34 +1705,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicateDlg = true;
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PM }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.PM,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PM }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       case "statuslist":
         m.vm.$router.push({
@@ -1835,6 +1819,7 @@ function generateMenu(vm) {
   if (lastReport != null && !vm.obj.userIsRestrictedType) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-pms.vue b/ayanova/src/views/svc-pms.vue
index c689cd38..6ffce19c 100644
--- a/ayanova/src/views/svc-pms.vue
+++ b/ayanova/src/views/svc-pms.vue
@@ -170,32 +170,16 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.PM }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PM)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.PM),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.PM }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "WorkOrderItemList":
@@ -254,6 +238,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-project.vue b/ayanova/src/views/svc-project.vue
index 9f0d9bc3..a927eab2 100644
--- a/ayanova/src/views/svc-project.vue
+++ b/ayanova/src/views/svc-project.vue
@@ -518,34 +518,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Project }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Project,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Project }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       case "WorkOrderList":
         m.vm.$router.push({
@@ -639,6 +623,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-projects.vue b/ayanova/src/views/svc-projects.vue
index 9d5ecbc6..353c8aef 100644
--- a/ayanova/src/views/svc-projects.vue
+++ b/ayanova/src/views/svc-projects.vue
@@ -71,35 +71,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Project }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Project)
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.Project
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Project }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -148,6 +133,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-item-expenses.vue b/ayanova/src/views/svc-quote-item-expenses.vue
index 57f2bf80..16d761af 100644
--- a/ayanova/src/views/svc-quote-item-expenses.vue
+++ b/ayanova/src/views/svc-quote-item-expenses.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.QuoteItemExpense
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemExpense
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.QuoteItemExpense
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-item-labors.vue b/ayanova/src/views/svc-quote-item-labors.vue
index 62ac840f..f99981f7 100644
--- a/ayanova/src/views/svc-quote-item-labors.vue
+++ b/ayanova/src/views/svc-quote-item-labors.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.QuoteItemLabor
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemLabor
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.QuoteItemLabor
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-item-loans.vue b/ayanova/src/views/svc-quote-item-loans.vue
index 00962d0e..9835aae0 100644
--- a/ayanova/src/views/svc-quote-item-loans.vue
+++ b/ayanova/src/views/svc-quote-item-loans.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.QuoteItemLoan
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemLoan
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.QuoteItemLoan
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-item-outside-services.vue b/ayanova/src/views/svc-quote-item-outside-services.vue
index 1e4e9509..735802ee 100644
--- a/ayanova/src/views/svc-quote-item-outside-services.vue
+++ b/ayanova/src/views/svc-quote-item-outside-services.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.QuoteItemOutsideService
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemOutsideService
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.QuoteItemOutsideService
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-item-parts.vue b/ayanova/src/views/svc-quote-item-parts.vue
index 521b7df3..1dda46fb 100644
--- a/ayanova/src/views/svc-quote-item-parts.vue
+++ b/ayanova/src/views/svc-quote-item-parts.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.QuoteItemPart
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemPart
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.QuoteItemPart
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-item-scheduled-users.vue b/ayanova/src/views/svc-quote-item-scheduled-users.vue
index 6f9682a7..76cf3c0d 100644
--- a/ayanova/src/views/svc-quote-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-quote-item-scheduled-users.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.QuoteItemScheduledUser
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemScheduledUser
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.QuoteItemScheduledUser
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-item-tasks.vue b/ayanova/src/views/svc-quote-item-tasks.vue
index 3afdaed1..663e6f17 100644
--- a/ayanova/src/views/svc-quote-item-tasks.vue
+++ b/ayanova/src/views/svc-quote-item-tasks.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.QuoteItemTask
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemTask
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.QuoteItemTask
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-item-travels.vue b/ayanova/src/views/svc-quote-item-travels.vue
index 01a9f36b..af996bc7 100644
--- a/ayanova/src/views/svc-quote-item-travels.vue
+++ b/ayanova/src/views/svc-quote-item-travels.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.QuoteItemTravel
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemTravel
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.QuoteItemTravel
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-item-units.vue b/ayanova/src/views/svc-quote-item-units.vue
index 5e6a701a..f8ebc657 100644
--- a/ayanova/src/views/svc-quote-item-units.vue
+++ b/ayanova/src/views/svc-quote-item-units.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.QuoteItemUnit
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItemUnit
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.QuoteItemUnit
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote-items.vue b/ayanova/src/views/svc-quote-items.vue
index d682d8bc..34131851 100644
--- a/ayanova/src/views/svc-quote-items.vue
+++ b/ayanova/src/views/svc-quote-items.vue
@@ -71,34 +71,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.QuoteItem }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.QuoteItem
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.QuoteItem }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "QuoteList":
@@ -205,6 +189,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quote.vue b/ayanova/src/views/svc-quote.vue
index 6b0ea8a3..d3ba8e23 100644
--- a/ayanova/src/views/svc-quote.vue
+++ b/ayanova/src/views/svc-quote.vue
@@ -1784,34 +1784,18 @@ async function clickHandler(menuItem) {
         m.vm.duplicateDlg = true;
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Quote }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Quote,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Quote }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       case "statuslist":
         m.vm.$router.push({
@@ -1919,6 +1903,7 @@ function generateMenu(vm) {
   if (lastReport != null && !vm.obj.userIsRestrictedType) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-quotes.vue b/ayanova/src/views/svc-quotes.vue
index 4e65d08c..a6f8ecd7 100644
--- a/ayanova/src/views/svc-quotes.vue
+++ b/ayanova/src/views/svc-quotes.vue
@@ -170,32 +170,16 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Quote }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Quote)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Quote),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Quote }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "WorkOrderItemList":
@@ -254,6 +238,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-task-group.vue b/ayanova/src/views/svc-task-group.vue
index 3e9e7452..aa83d3bb 100644
--- a/ayanova/src/views/svc-task-group.vue
+++ b/ayanova/src/views/svc-task-group.vue
@@ -575,34 +575,18 @@ async function clickHandler(menuItem) {
         });
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.TaskGroup }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.TaskGroup,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.TaskGroup }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(
@@ -670,6 +654,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-unit-model.vue b/ayanova/src/views/svc-unit-model.vue
index f77db27e..42c3e125 100644
--- a/ayanova/src/views/svc-unit-model.vue
+++ b/ayanova/src/views/svc-unit-model.vue
@@ -631,36 +631,19 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.UnitModel }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.UnitModel,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.UnitModel }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -723,6 +706,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-unit-models.vue b/ayanova/src/views/svc-unit-models.vue
index d236addb..87842839 100644
--- a/ayanova/src/views/svc-unit-models.vue
+++ b/ayanova/src/views/svc-unit-models.vue
@@ -71,37 +71,20 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.UnitModel }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.UnitModel
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.UnitModel }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -150,6 +133,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index 9fd5a2a0..52ea7077 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -1230,36 +1230,19 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Unit }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Unit,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Unit }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
-
       case "geoview":
         window.$gz.util.viewGeoLocation({
           latitude: m.vm.obj.latitude,
@@ -1363,6 +1346,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-units.vue b/ayanova/src/views/svc-units.vue
index 03e64896..e538b024 100644
--- a/ayanova/src/views/svc-units.vue
+++ b/ayanova/src/views/svc-units.vue
@@ -105,35 +105,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Unit }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Unit)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Unit),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Unit }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -182,6 +165,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-expenses.vue b/ayanova/src/views/svc-workorder-item-expenses.vue
index 9ea33cd6..2d109e75 100644
--- a/ayanova/src/views/svc-workorder-item-expenses.vue
+++ b/ayanova/src/views/svc-workorder-item-expenses.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemExpense
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemExpense
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemExpense
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "WorkOrderList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-labors.vue b/ayanova/src/views/svc-workorder-item-labors.vue
index 04cd696a..a0d9aa09 100644
--- a/ayanova/src/views/svc-workorder-item-labors.vue
+++ b/ayanova/src/views/svc-workorder-item-labors.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemLabor
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemLabor
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemLabor
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "WorkOrderList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-loans.vue b/ayanova/src/views/svc-workorder-item-loans.vue
index 3aa306c8..cb0ec071 100644
--- a/ayanova/src/views/svc-workorder-item-loans.vue
+++ b/ayanova/src/views/svc-workorder-item-loans.vue
@@ -201,6 +201,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-outside-services.vue b/ayanova/src/views/svc-workorder-item-outside-services.vue
index 1b1b2bc0..d051be52 100644
--- a/ayanova/src/views/svc-workorder-item-outside-services.vue
+++ b/ayanova/src/views/svc-workorder-item-outside-services.vue
@@ -168,6 +168,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-part-requests.vue b/ayanova/src/views/svc-workorder-item-part-requests.vue
index a2d0455f..cd8f8692 100644
--- a/ayanova/src/views/svc-workorder-item-part-requests.vue
+++ b/ayanova/src/views/svc-workorder-item-part-requests.vue
@@ -168,6 +168,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-parts.vue b/ayanova/src/views/svc-workorder-item-parts.vue
index 282912a9..5da3ce6d 100644
--- a/ayanova/src/views/svc-workorder-item-parts.vue
+++ b/ayanova/src/views/svc-workorder-item-parts.vue
@@ -201,6 +201,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-scheduled-users.vue b/ayanova/src/views/svc-workorder-item-scheduled-users.vue
index a4aeaf1f..265e2503 100644
--- a/ayanova/src/views/svc-workorder-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-workorder-item-scheduled-users.vue
@@ -201,6 +201,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-tasks.vue b/ayanova/src/views/svc-workorder-item-tasks.vue
index 715dfc9d..f582f54d 100644
--- a/ayanova/src/views/svc-workorder-item-tasks.vue
+++ b/ayanova/src/views/svc-workorder-item-tasks.vue
@@ -168,6 +168,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-travels.vue b/ayanova/src/views/svc-workorder-item-travels.vue
index 0005d366..c3064a6c 100644
--- a/ayanova/src/views/svc-workorder-item-travels.vue
+++ b/ayanova/src/views/svc-workorder-item-travels.vue
@@ -73,40 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemTravel
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemTravel
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemTravel
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "WorkOrderList":
@@ -168,6 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-item-units.vue b/ayanova/src/views/svc-workorder-item-units.vue
index c34071ee..ede5280a 100644
--- a/ayanova/src/views/svc-workorder-item-units.vue
+++ b/ayanova/src/views/svc-workorder-item-units.vue
@@ -106,40 +106,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
-            }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItemUnit
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: {
-              recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
-            }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "WorkOrderList":
@@ -201,6 +179,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder-items.vue b/ayanova/src/views/svc-workorder-items.vue
index 22c6c9b2..35d9ea2c 100644
--- a/ayanova/src/views/svc-workorder-items.vue
+++ b/ayanova/src/views/svc-workorder-items.vue
@@ -73,34 +73,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.WorkOrderItem }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
               window.$gz.type.WorkOrderItem
-            )
+            ),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.WorkOrderItem }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "WorkOrderList":
@@ -212,6 +196,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 77ef1641..960916a6 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -1875,40 +1875,6 @@ async function clickHandler(menuItem) {
         m.vm.duplicateTo = "pm";
         m.vm.duplicateDlg = true;
         break;
-      // case "report":
-      //   if (m.id != null) {
-      //     //last report selected is in m.id
-      //     m.vm.$router.push({
-      //       name: "ay-report",
-      //       params: { recordid: m.id, ayatype: window.$gz.type.WorkOrder }
-      //     });
-      //   } else {
-      //     //general report selector chosen
-      //     console.log("At report");
-      //     let res = await m.vm.$refs.reportSelector.open({
-      //       AType: window.$gz.type.WorkOrder,
-      //       selectedRowIds: [m.vm.obj.id]
-      //     });
-      //     console.log("RESPONSE:", res);
-      //     //if null for no selection
-      //     //just bail out
-      //     if (res == null) {
-      //       return;
-      //     }
-      //     console.log("svc-workorder:report, calling setLastReport:", {
-      //       formkey: FORM_KEY,
-      //       res: res
-      //     });
-      //     //persist last report selected
-      //     window.$gz.form.setLastReport(FORM_KEY, res);
-
-      //     //Now open the report viewer...
-      //     m.vm.$router.push({
-      //       name: "ay-report",
-      //       params: { recordid: res.id, ayatype: window.$gz.type.WorkOrder }
-      //     });
-      //   }
-      //   break;
       case "report":
         let res = await m.vm.$refs.reportSelector.open(
           {
@@ -2029,6 +1995,7 @@ function generateMenu(vm) {
   if (lastReport != null && !vm.obj.userIsRestrictedType) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/svc-workorders.vue b/ayanova/src/views/svc-workorders.vue
index 619ee83f..5aa24eef 100644
--- a/ayanova/src/views/svc-workorders.vue
+++ b/ayanova/src/views/svc-workorders.vue
@@ -169,37 +169,6 @@ async function clickHandler(menuItem) {
           m.vm.reload = !m.vm.reload;
         }
         break;
-      // case "report":
-      //   if (m.id != null) {
-      //     //last report selected is in m.id
-      //     m.vm.$router.push({
-      //       name: "ay-report",
-      //       params: { recordid: m.id, ayatype: window.$gz.type.WorkOrder }
-      //     });
-      //   } else {
-      //     //general report selector chosen
-
-      //     let res = await m.vm.$refs.reportSelector.open(
-      //       m.vm.$refs.gzdatatable.getDataListSelection(
-      //         window.$gz.type.WorkOrder
-      //       )
-      //     );
-
-      //     //if null for no selection
-      //     //just bail out
-      //     if (res == null) {
-      //       return;
-      //     }
-      //     //persist last report selected
-      //     window.$gz.form.setLastReport(FORM_KEY, res);
-
-      //     //Now open the report viewer...
-      //     m.vm.$router.push({
-      //       name: "ay-report",
-      //       params: { recordid: res.id, ayatype: window.$gz.type.WorkOrder }
-      //     });
-      //   }
-      //   break;
       case "report":
         {
           let res = await m.vm.$refs.reportSelector.open(
@@ -271,6 +240,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/vendor.vue b/ayanova/src/views/vendor.vue
index 0af784cf..5974a5cd 100644
--- a/ayanova/src/views/vendor.vue
+++ b/ayanova/src/views/vendor.vue
@@ -1024,36 +1024,19 @@ async function clickHandler(menuItem) {
         m.vm.duplicate();
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Vendor }
-          });
-        } else {
-          //general report selector chosen
-
-          let res = await m.vm.$refs.reportSelector.open({
+        let res = await m.vm.$refs.reportSelector.open(
+          {
             AType: window.$gz.type.Vendor,
             selectedRowIds: [m.vm.obj.id]
-          });
-
-          //if null for no selection
-          //just bail out
-          if (res == null) {
-            return;
-          }
-          //persist last report selected
-          window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Vendor }
-          });
+          },
+          m.id
+        );
+        if (res == null) {
+          return;
         }
+        window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
-
       case "geoview":
         window.$gz.util.viewGeoLocation({
           latitude: m.vm.obj.latitude,
@@ -1127,6 +1110,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
diff --git a/ayanova/src/views/vendors.vue b/ayanova/src/views/vendors.vue
index 7177f86d..fba10e08 100644
--- a/ayanova/src/views/vendors.vue
+++ b/ayanova/src/views/vendors.vue
@@ -71,35 +71,18 @@ async function clickHandler(menuItem) {
         }
         break;
       case "report":
-        if (m.id != null) {
-          //last report selected is in m.id
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.Vendor }
-          });
-        } else {
-          //general report selector chosen
-
+        {
           let res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Vendor)
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Vendor),
+            m.id
           );
-
-          //if null for no selection
-          //just bail out
           if (res == null) {
             return;
           }
-          //persist last report selected
           window.$gz.form.setLastReport(FORM_KEY, res);
-
-          //Now open the report viewer...
-          m.vm.$router.push({
-            name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.Vendor }
-          });
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
-
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
@@ -148,6 +131,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
+      notrans: true,
       icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm