diff --git a/app/presenters/post_set_presenters/post.rb b/app/presenters/post_set_presenters/post.rb
index 7fcd27dfd..4b64a70e4 100644
--- a/app/presenters/post_set_presenters/post.rb
+++ b/app/presenters/post_set_presenters/post.rb
@@ -47,7 +47,10 @@ module PostSetPresenters
       tag = Tag.find_by_name(post_set.tag_string)
 
       if tag
-        return tag.related_tag_array.map(&:first)
+        tag.related_tag_array.map(&:first)
+      else
+        tag = Tag.find_or_create_by_name(post_set.tag_string)
+        tag.related_tag_array.map(&:first)
       end
     end
     
diff --git a/app/presenters/tag_set_presenter.rb b/app/presenters/tag_set_presenter.rb
index c2817c7a5..d96497bb1 100644
--- a/app/presenters/tag_set_presenter.rb
+++ b/app/presenters/tag_set_presenter.rb
@@ -7,6 +7,7 @@
 class TagSetPresenter < Presenter
   def initialize(tags)
     @tags = tags
+    puts @tags.inspect
   end
   
   def tag_list_html(template, options = {})
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 33b1412bf..e220b5f04 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -191,8 +191,8 @@ module Danbooru
       @canonical_tag_category_mapping ||= {
         "General" => 0,
         "Artist" => 1,
-        "Copyright" => 2,
-        "Character" => 3
+        "Copyright" => 3,
+        "Character" => 4
       }
     end