diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb
index f049b829f..21e0dd2fb 100644
--- a/app/models/tag_alias.rb
+++ b/app/models/tag_alias.rb
@@ -16,7 +16,7 @@ class TagAlias < ActiveRecord::Base
     end
     
     def active
-      where("status = ?", "active")
+      where("status IN (?)", ["active", "processing"])
     end
 
     def search(params)
@@ -62,7 +62,7 @@ class TagAlias < ActiveRecord::Base
   def self.to_aliased(names)
     Array(names).flatten.map do |name|
       Cache.get("ta:#{Cache.sanitize(name)}") do
-        ActiveRecord::Base.select_value_sql("select consequent_name from tag_aliases where status = 'active' and antecedent_name = ?", name) || name
+        ActiveRecord::Base.select_value_sql("select consequent_name from tag_aliases where status in ('active', 'processing') and antecedent_name = ?", name) || name
       end
     end.uniq
   end
diff --git a/app/models/tag_implication.rb b/app/models/tag_implication.rb
index 414d14e34..c60ff1b85 100644
--- a/app/models/tag_implication.rb
+++ b/app/models/tag_implication.rb
@@ -15,7 +15,7 @@ class TagImplication < ActiveRecord::Base
     module ClassMethods
       # assumes names are normalized
       def with_descendants(names)
-        (names + where("antecedent_name in (?) and status = ?", names, "active").map(&:descendant_names_array)).flatten.uniq
+        (names + where("antecedent_name in (?) and status in (?)", names, ["active", "processing"]).map(&:descendant_names_array)).flatten.uniq
       end
     end
 
@@ -26,7 +26,7 @@ class TagImplication < ActiveRecord::Base
 
           until children.empty?
             all.concat(children)
-            children = TagImplication.where("antecedent_name IN (?) and status = ?", children, "active").all.map(&:consequent_name)
+            children = TagImplication.where("antecedent_name IN (?) and status in (?)", children, ["active", "processing"]).all.map(&:consequent_name)
           end
         end.sort.uniq
       end
diff --git a/test/unit/current_user_test.rb b/test/unit/current_user_test.rb
index 6d49a9ac1..796b96039 100644
--- a/test/unit/current_user_test.rb
+++ b/test/unit/current_user_test.rb
@@ -6,6 +6,10 @@ class CurrentUserTest < ActiveSupport::TestCase
     CurrentUser.ip_addr = nil
   end
 
+  teardown do
+    Thread.current[:safe_mode] = false
+  end
+
   context ".safe_mode?" do
     should "return true if the host contains the string host" do
       req = mock(:host => "safebooru")