diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index 4de0feb8..8a36eb52 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -267,8 +267,8 @@ export default {
       //NOTE debounce with a watcher is a bit different, currently it has to be done exactly this way, nothing else will work properly
       //https://vuejs.org/v2/guide/migration.html#debounce-Param-Attribute-for-v-model-removed
       //-----------------
-   
-      let vm = this;     
+
+      let vm = this;
       let isATwoTermQuery = false;
       let queryTerms = [];
       //NOTE: empty query is valid; it means get the top 100 ordered by template order
@@ -289,7 +289,7 @@ export default {
           isATwoTermQuery = true;
         } else {
           //one term only so push it into array
-          queryTerms.push(searchEntered);
+          queryTerms.push(searchFor);
           //Marker term, will be weeded back out later
           queryTerms.push("[?]");
         }
diff --git a/ayanova/tests/e2e/specs/select-list-templates.js b/ayanova/tests/e2e/specs/select-list-templates.js
index 8e0f5906..2e6a1537 100644
--- a/ayanova/tests/e2e/specs/select-list-templates.js
+++ b/ayanova/tests/e2e/specs/select-list-templates.js
@@ -31,11 +31,35 @@ describe("PICK LIST TEMPLATE", () => {
     cy.visit("/widgets/0");
     cy.url().should("include", "/widgets/0");
     //select a user with a zone set
-    cy.get("[data-cy=userid] > .v-input").type(
-      "..zone1{downarrow}{downarrow}{enter}"
-    );
+    cy.get("[data-cy=userid] > .v-input")
+      .type("..zone")
+      .wait(500)
+      .type("{downarrow}{downarrow}{enter}");
     //tags is off so there shouldn't be any "zones" visible in there
-    cy.contains("zone1").should("not.exist");
+    cy.contains("zone").should("not.exist");
+
+    //NOW DO THE OPPOSITE
+    cy.visit("/adm-global-settings");
+    cy.url().should("include", "/adm-global-settings");
+    cy.get("[data-cy=picklisttemplates]").click();
+    cy.url().should("include", "/adm-global-select-templates");
+    cy.get("[data-cy=SelectTemplate]").type("3{enter}", { force: true });
+
+    //show tags field
+    cy.get("[data-cy=usertagsInclude]").check({ force: true });
+    cy.get(
+      '[data-cy="adm-global-select-templates:save"] > .v-btn__content > .v-icon'
+    ).click({ force: true });
+    cy.visit("/widgets/0");
+    cy.url().should("include", "/widgets/0");
+    //select a user with a zone set
+    cy.get("[data-cy=userid] > .v-input")
+      .type("..zone")
+      .wait(500)
+      .type("{downarrow}{downarrow}{enter}");
+    //tags is on so there should be "zone1" visible in there
+    cy.contains("zone").should("exist");
+
     //-----------------
   });
 });