diff --git a/app/models/tag.rb b/app/models/tag.rb
index 0283444bc..2cff2a059 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -349,8 +349,11 @@ class Tag < ApplicationRecord
 
       query1 =
         Tag
+        .nonempty
         .select("tags.name, tags.post_count, tags.category, null AS antecedent_name")
-        .search(:name_matches => wildcard_name, :order => "count").limit(limit)
+        .name_matches(wildcard_name)
+        .order(post_count: :desc)
+        .limit(limit)
 
       query2 =
         TagAlias