diff --git a/client/html/tag_edit.tpl b/client/html/tag_edit.tpl
index cc8b083b..65bd187d 100644
--- a/client/html/tag_edit.tpl
+++ b/client/html/tag_edit.tpl
@@ -3,7 +3,7 @@
         <div class='input'>
             <ul>
                 <li class='names'>
-                    <%= ctx.makeTextInput({text: 'Names', value: ctx.tag.names.join(' '), required: true, readonly: !ctx.canEditNames, pattern: ctx.tagNamesPattern}) %>
+                    <%= ctx.makeTextInput({text: 'Names', value: ctx.tag.names.join(' '), required: true, readonly: !ctx.canEditNames}) %>
                 </li>
                 <li class='category'>
                     <%= ctx.makeSelect({text: 'Category', keyValues: ctx.categories, selectedKey: ctx.tag.category, required: true, readonly: !ctx.canEditCategory}) %>
diff --git a/client/js/controls/auto_complete_control.js b/client/js/controls/auto_complete_control.js
index 26e63a93..4a0da00c 100644
--- a/client/js/controls/auto_complete_control.js
+++ b/client/js/controls/auto_complete_control.js
@@ -30,6 +30,7 @@ class AutoCompleteControl {
         Object.assign(this._options, {
             verticalShift: 2,
             source: null,
+            addSpace: false,
             maxResults: 15,
             getTextToFind: () => {
                 const value = sourceInputNode.value;
@@ -50,6 +51,9 @@ class AutoCompleteControl {
                     this._results[this._activeResult].value +
                     ' ' +
                     suffix.trimLeft();
+                if (!this._options.addSpace) {
+                    sourceInputNode.value = sourceInputNode.value.trim();
+                }
                 sourceInputNode.focus();
             },
             delete: text => {
diff --git a/client/js/controls/tag_auto_complete_control.js b/client/js/controls/tag_auto_complete_control.js
index 731a366b..2e7fe99c 100644
--- a/client/js/controls/tag_auto_complete_control.js
+++ b/client/js/controls/tag_auto_complete_control.js
@@ -10,9 +10,7 @@ class TagAutoCompleteControl extends AutoCompleteControl {
         const caseSensitive = false;
         const minLengthForPartialSearch = 3;
 
-        if (!options) {
-            options = {};
-        }
+        options = Object.assign({}, options);
 
         options.getMatches = text => {
             const transform = caseSensitive ?
diff --git a/client/js/views/posts_header_view.js b/client/js/views/posts_header_view.js
index 2cee2e42..9ac6725b 100644
--- a/client/js/views/posts_header_view.js
+++ b/client/js/views/posts_header_view.js
@@ -17,7 +17,7 @@ class PostsHeaderView {
         views.replaceContent(this._hostNode, template(ctx));
 
         if (this._queryInputNode) {
-            new TagAutoCompleteControl(this._queryInputNode);
+            new TagAutoCompleteControl(this._queryInputNode, {addSpace: true});
         }
 
         keyboard.bind('q', () => {