diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index c317919a..76693f34 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -49,6 +49,9 @@ CURRENT TODOs
 
 @@@@@@@@@@@ ROADMAP STAGE 2:
 
+todo: selectlist is no longer searching! WTF?
+	- fix that and then come back to the select-list-template test which should search for tag and not show tag in pl
+		- or something, any way that is simple to see that the template is adjusted, maybe search for exact item and compare pre and post
 
 todo: add tests for the following:	
 	- picklist editor form
diff --git a/ayanova/src/views/adm-global-select-templates.vue b/ayanova/src/views/adm-global-select-templates.vue
index 8ebcc644..2020689c 100644
--- a/ayanova/src/views/adm-global-select-templates.vue
+++ b/ayanova/src/views/adm-global-select-templates.vue
@@ -3,6 +3,13 @@
     <v-row v-if="formState.ready">
       <v-col>
         <v-form ref="form">
+          <!-- Prevent implicit submission of the form on enter key, this is not necessary on a form with a text area which is why I never noticed it with the other forms -->
+          <button
+            type="submit"
+            disabled
+            style="display: none"
+            aria-hidden="true"
+          ></button>
           <v-row>
             <v-col cols="12" mt-1 mb-2>
               <v-alert
@@ -57,6 +64,7 @@
                       :ref="item.key"
                       :disabled="item.required"
                       @change="includeChanged(item)"
+                      :data-cy="!!$ay.dev ? item.key + 'Include' : false"
                     ></v-checkbox>
                     <!-- RE-ORDER CONTROL -->
                     <div class="d-flex justify-space-between">
diff --git a/ayanova/tests/e2e/specs/select-list-templates.js b/ayanova/tests/e2e/specs/select-list-templates.js
index 4c4dcedb..f78e922a 100644
--- a/ayanova/tests/e2e/specs/select-list-templates.js
+++ b/ayanova/tests/e2e/specs/select-list-templates.js
@@ -18,10 +18,17 @@ describe("PICK LIST TEMPLATE", () => {
     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("u{tab}", {
-      force: true
-    });
+    cy.get("[data-cy=SelectTemplate]").type("3{enter}", { force: true });
 
+    //hide tags field
+    cy.get("[data-cy=useremployeenumberInclude]").uncheck({ force: true });
+    cy.get(
+      '[data-cy="adm-global-select-templates:save"] > .v-btn__content > .v-icon'
+    ).click();
+    cy.visit("/widgets/0");
+    cy.url().should("include", "/widgets/0");
+    cy.get("[data-cy=userid] > .v-input").type("a ..zone");
+    //tags is off so there shouldn't be any "zones" visible in there
     //-----------------
   });
 });