diff --git a/assets/css/views/_tags.scss b/assets/css/views/_tags.scss
index 6626dda4..331ff13d 100644
--- a/assets/css/views/_tags.scss
+++ b/assets/css/views/_tags.scss
@@ -43,6 +43,7 @@
   position: absolute;
   user-select: none;
   white-space: nowrap;
+  z-index: 999;
 }
 
 .autocomplete__item {
diff --git a/assets/js/autocomplete.js b/assets/js/autocomplete.js
index 1b7c6fd8..1551a6f8 100644
--- a/assets/js/autocomplete.js
+++ b/assets/js/autocomplete.js
@@ -229,7 +229,7 @@ function listenAutocomplete() {
           return;
         }
 
-        originalTerm = selectedTerm[1];
+        originalTerm = selectedTerm[1].toLowerCase();
       }
       else {
         originalTerm = `${inputField.value}`.toLowerCase();