diff --git a/web/templates/tags_widget.html b/web/templates/tags_widget.html
index 495a39f..0f85b29 100644
--- a/web/templates/tags_widget.html
+++ b/web/templates/tags_widget.html
@@ -3,7 +3,7 @@
         <div class="small-9 medium-10 large-5 cell" 
             hx-post="/tags"
             hx-target="#label-widget"
-            hx-trigger="change">
+            hx-trigger="change queue:first">
             <label for="tag-entry" 
                     class="">Tags</label>
 
diff --git a/web/web.go b/web/web.go
index ee1c577..d7f5d89 100644
--- a/web/web.go
+++ b/web/web.go
@@ -402,7 +402,10 @@ func cleanupTags(tags []string) []string {
 	keys := make(map[string]struct{})
 	for _, k := range tags {
 		if k != "" && k != "|" {
-			keys[strings.ToLower(k)] = struct{}{}
+			for _, subKey := range strings.Split(k, ",") {
+				subKey := strings.Trim(subKey, " ")
+				keys[strings.ToLower(subKey)] = struct{}{}
+			}
 		}
 	}
 	out := []string{}