diff --git a/app/models/tag.rb b/app/models/tag.rb
index aa6d0bdfb..abd992228 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -417,7 +417,19 @@ class Tag < ActiveRecord::Base
         q = q.where("post_count > 0")
       end
       
-      case params[:sort].present?
+      if params[:limit].present?
+        q = q.limit(params[:limit].to_i)
+      end
+      
+      case params[:order]
+      when "date"
+        q = q.order("created_at desc")
+        
+      else
+        q = q.order("name")
+      end
+      
+      case params[:sort]
       when "count"
         q = q.order("post_count desc")