diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js
index 0a3e7f6b..89ceb0d1 100644
--- a/ayanova/src/api/locale.js
+++ b/ayanova/src/api/locale.js
@@ -156,7 +156,8 @@ export default {
     "PageOfPageText",
     "Loading",
     "AM",
-    "PM"
+    "PM",
+    "DataListSortFilter"
   ],
 
   ////////////////////////////////////////////////////////
diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index ac501e18..1d5c997b 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -375,9 +375,6 @@ export default {
 
       that.loading = true;
 
-      // var listUrl =
-      //   that.apiBaseUrl + "?" + window.$gz.api.buildQuery(listOptions);
-
       // {
       //   "offset": 0,
       //   "limit": 0,
diff --git a/ayanova/src/views/ay-sort-filter.vue b/ayanova/src/views/ay-sort-filter.vue
index fea562c4..8cd36cfb 100644
--- a/ayanova/src/views/ay-sort-filter.vue
+++ b/ayanova/src/views/ay-sort-filter.vue
@@ -22,6 +22,7 @@
       {{ tempTemplate }}
     </div>
     <v-divider></v-divider> -->
+    key:{{ dataListKey }}, id: {{ recordid }}
     <v-row v-if="this.formState.ready">
       <v-col>
         <v-form ref="form">
@@ -38,8 +39,6 @@
                 >{{ formState.errorBoxMessage }}</v-alert
               >
             </v-col>
-
-        
           </v-row>
         </v-form>
       </v-col>
@@ -112,6 +111,8 @@ export default {
   data() {
     return {
       obj: [],
+      recordid: this.$route.params.recordid,
+      dataListKey: this.$route.params.dataListKey,
       concurrencyToken: undefined,
       formCustomTemplateKey: this.$route.params.formCustomTemplateKey,
       pickLists: {
diff --git a/ayanova/src/views/test-widgets.vue b/ayanova/src/views/test-widgets.vue
index 7999d073..e490cd3e 100644
--- a/ayanova/src/views/test-widgets.vue
+++ b/ayanova/src/views/test-widgets.vue
@@ -1,8 +1,9 @@
 <template>
   <gz-data-table
     formKey="test-widgets"
-    dataListKey="TestWidgetDataList"
-    :dataFilterId="currentDataFilterId"
+    :dataListKey="dataListKey"
+    :dataListFilter="dataListFilter"
+    :dataListSort="dataListSort"
     :showSelect="true"
     :singleSelect="false"
     v-on:update:selected="handleSelected"
@@ -12,7 +13,7 @@
 
 <script>
 import GzDataTable from "../components/gz-data-table.vue";
-
+const FORM_KEY = "test-widgets";
 export default {
   components: {
     GzDataTable
@@ -21,14 +22,31 @@ export default {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
       icon: "vial",
-      title: window.$gz.locale.get("WidgetList")
-      //,
-      //helpUrl: "form-inv-parts"
+      title: window.$gz.locale.get("WidgetList"),
+      helpUrl: "form-ay-sort-filter",
+      menuItems: [
+        {
+          title: window.$gz.locale.get("DataListSortFilter"),
+          icon: "filter",
+          surface: true,
+          key: FORM_KEY + ":sortfilter",
+          vm: this
+        }
+      ]
     });
   },
+  created() {
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
   data() {
     return {
-      currentDataFilterId: 0
+      currentDataFilterId: 0,
+      dataListKey: "TestWidgetDataList",
+      dataListFilter: "",
+      dataListSort: ""
     };
   },
   methods: {
@@ -37,4 +55,33 @@ export default {
     }
   }
 };
+
+/////////////////////////////
+//
+//
+function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  var m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "sortfilter":
+        m.vm.$router.push({
+          name: "ay-sort-filter",
+          params: {
+            recordid: m.vm.currentDataFilterId,
+            dataListKey: m.vm.dataListKey
+          }
+        });
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
 </script>