diff --git a/marko/page/story-content/components/edit-story-tags-modal/component.js b/marko/page/story-content/components/edit-story-tags-modal/component.js
index 7603a35..e891bd1 100644
--- a/marko/page/story-content/components/edit-story-tags-modal/component.js
+++ b/marko/page/story-content/components/edit-story-tags-modal/component.js
@@ -19,6 +19,11 @@ module.exports = class {
   }
 
   addTag(tag) {
+    if (tag.kind == "" || tag.name.length < 1) {
+      this.state.error = "You cannot add an empty tag"
+      return
+    }
+
     this.state.error = null
 
     storyApi.addTag({id: this.input.story.id, tag}).then(({tags}) => {
diff --git a/marko/page/story-content/components/story-tag-options/component.js b/marko/page/story-content/components/story-tag-options/component.js
index 3bbdd0b..c992639 100644
--- a/marko/page/story-content/components/story-tag-options/component.js
+++ b/marko/page/story-content/components/story-tag-options/component.js
@@ -5,7 +5,7 @@ module.exports = class {
     this.state = {
       values: {
         name: "",
-        kind: "Event",
+        kind: "Character",
       },
       tags: [],
       suggestions: [],
@@ -27,7 +27,7 @@ module.exports = class {
         this.state.suggestions = []
 
         const suggestions = this.state.tags.filter(t => t.name.toLowerCase().includes(search))
-        if (suggestions.length > 0 && suggestions.length < 10) {
+        if (suggestions.length > 0 && suggestions.length < 20) {
           if (suggestions.length > 1 || suggestions[0].name !== name) {
             this.state.suggestions = suggestions
           }
diff --git a/marko/page/story-content/components/story-tag-options/style.less b/marko/page/story-content/components/story-tag-options/style.less
index 9148391..db84384 100644
--- a/marko/page/story-content/components/story-tag-options/style.less
+++ b/marko/page/story-content/components/story-tag-options/style.less
@@ -16,11 +16,11 @@ div.tag-options {
   }
 
   div.suggestion-list {
-    margin-top: 1em;
+    margin: 2em 0;
 
     a.tag {
       display: inline-block;
-      margin: 0.5em 0.5ch;
+      margin: 0.25em 0.5ch;
       padding: 0.0625em 0.5ch;
   
       outline: 1px solid;
@@ -34,7 +34,7 @@ div.tag-options {
     }
   
     div.header {
-      display: inline-block;
+      display: block;
       margin: 0.5em 0.5ch;
       padding: 0.0625em 0.5ch;