diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 3c291f060e7..f148b15d9a5 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -101,6 +101,10 @@ def show_hidden
                 Work
               when "chapter"
                 Chapter
+              when "request"
+                Request
+              when "externalwork"
+                ExternalWork
               end
       @display_creation = model.find(params[:creation_id]) if model.is_a? Class
 
@@ -114,9 +118,9 @@ def show_hidden
       else
         @display_tags = case params[:tag_type]
                         when 'warnings'
-                          @display_creation.archive_warnings
+                          @display_creation.tag_groups["ArchiveWarning"]
                         when 'freeforms'
-                          @display_creation.freeforms
+                          @display_creation.tag_groups["Freeform"]
                         end
       end
 
diff --git a/features/prompt_memes_a/challenge_promptmeme_setup.feature b/features/prompt_memes_a/challenge_promptmeme_setup.feature
index 43990bf6598..1532fe04c83 100644
--- a/features/prompt_memes_a/challenge_promptmeme_setup.feature
+++ b/features/prompt_memes_a/challenge_promptmeme_setup.feature
@@ -3,6 +3,24 @@ Feature: Prompt Meme Challenge
   In order to have an archive full of works
   As a humble user
   I want to create a prompt meme and post to it
+
+  @javascript
+  Scenario: Can hide and show additional tags on a prompt
+
+  Given I have Battle 12 prompt meme fully set up
+  Given I am logged in as "myname1"
+    And I sign up for Battle 12 with combination A
+  When I am logged in as "myname2"
+    And I follow "My Preferences"
+    And I check "Hide additional tags"
+    And I press "Update"
+    And I go to "Battle 12" collection's page
+    And I follow "Prompts (2)"
+  Then I should see "Show additional tags"
+    And I should not see "Alternate Universe - Historical"
+  When I follow "Show additional tags"
+  Then I should not see "Show additional tags"
+    And I should see "Alternate Universe - Historical"
   
   Scenario: Can create a collection to house a prompt meme