diff --git a/app/controllers/bans_controller.rb b/app/controllers/bans_controller.rb
index 5b9d1372a..b3eba6c9c 100644
--- a/app/controllers/bans_controller.rb
+++ b/app/controllers/bans_controller.rb
@@ -11,8 +11,8 @@ class BansController < ApplicationController
   end
 
   def index
-    @search = Ban.search(params[:search]).order("id desc")
-    @bans = @search.paginate(params[:page], :limit => params[:limit])
+    @bans = Ban.search(params[:search])
+    @bans = @bans.paginate(params[:page], :limit => params[:limit])
     respond_with(@bans)
   end
 
diff --git a/app/models/ban.rb b/app/models/ban.rb
index 6cbf0d39b..289abf564 100644
--- a/app/models/ban.rb
+++ b/app/models/ban.rb
@@ -10,13 +10,23 @@ class Ban < ActiveRecord::Base
   validates_presence_of :user_id, :reason, :duration
   before_validation :initialize_banner_id, :on => :create
 
+  scope :unexpired, -> { where("bans.expires_at > ?", Time.now) }
+  scope :expired, -> { where("bans.expires_at <= ?", Time.now) }
+
   def self.is_banned?(user)
     exists?(["user_id = ? AND expires_at > ?", user.id, Time.now])
   end
 
+  def self.reason_matches(query)
+    if query =~ /\*/
+      where("lower(bans.reason) LIKE ?", query.to_escaped_for_sql_like)
+    else
+      where("bans.reason @@ plainto_tsquery(?)", query)
+    end
+  end
+
   def self.search(params)
     q = where("true")
-    return q if params.blank?
 
     if params[:banner_name]
       q = q.where("banner_id = (select _.id from users _ where lower(_.name) = ?)", params[:banner_name].mb_chars.downcase)
@@ -34,6 +44,22 @@ class Ban < ActiveRecord::Base
       q = q.where("user_id = ?", params[:user_id].to_i)
     end
 
+    if params[:reason_matches].present?
+      q = q.reason_matches(params[:reason_matches])
+    end
+
+    case params[:expired]
+    when "true"  then q = q.expired
+    when "false" then q = q.unexpired
+    end
+
+    case params[:order]
+    when "expires_at_desc"
+      q = q.order("bans.expires_at desc")
+    else
+      q = q.order("bans.id desc")
+    end
+
     q
   end