diff --git a/app/Controller/TagsController.php b/app/Controller/TagsController.php
index 7dab8102f..a6a1826e8 100644
--- a/app/Controller/TagsController.php
+++ b/app/Controller/TagsController.php
@@ -710,7 +710,7 @@ class TagsController extends AppController
 
         $items = array();
         foreach ($tags as $k => $tag) {
-            $tagTemplate = '<a href="#" class="tagComplete" style="background-color:{{=it.background}}; color:{{=it.color}}">{{=it.name}}</a>';
+            $tagTemplate = '<span href="#" class="tagComplete" style="background-color:{{=it.background}}; color:{{=it.color}}">{{=it.name}}</span>';
 
             $tagName = $tag['name'];
             $choice_id = $k;
diff --git a/app/View/Elements/generic_picker.ctp b/app/View/Elements/generic_picker.ctp
index b58054afd..49e6433a1 100644
--- a/app/View/Elements/generic_picker.ctp
+++ b/app/View/Elements/generic_picker.ctp
@@ -253,6 +253,7 @@ function submitFunction(clicked, callback) {
         selected = $clicked.attr('value');
         additionalData = $clicked.data('additionaldata');
     }
+    execAndClose(clicked);
     callback(selected, additionalData);
 }
 </script>
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 6616053cd..2b042f998 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -3381,7 +3381,6 @@ function addGalaxyListener(id) {
 	popoverPopup(id, target_type + '/' + target_id, 'galaxies', 'selectGalaxyNamespace');
 }
 
-// function quickSubmitGalaxyForm(scope, cluster_id, event_id) {
 function quickSubmitGalaxyForm(cluster_ids, additionalData) {
 	scope = additionalData['target_id'];
 	scope_id = additionalData['target_type'];