diff --git a/app/models/user.rb b/app/models/user.rb
index 4cf2dcefc..e32c478de 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -454,6 +454,10 @@ class User < ActiveRecord::Base
         q = q.where("level >= ?", params[:min_level].to_i)
       end
       
+      if params[:id]
+        q = q.where("id = ?", params[:id].to_i)
+      end
+      
       q
     end
   end
diff --git a/config/routes.rb b/config/routes.rb
index ae13c3543..dd97da9fd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -244,7 +244,7 @@ Danbooru::Application.routes.draw do
   
   match "/wiki" => redirect {|params, req| "/wiki_pages?page=#{req.params[:page]}"}
   match "/wiki/index" => redirect {|params, req| "/wiki_pages?page=#{req.params[:page]}"}
-  match "/wiki/show/:title" => redirect("/wiki_pages?title=%{title}")
+  match "/wiki/show" => redirect {|params, req| "/wiki_pages?title=#{req.params[:title]}"}
   match "/wiki/recent_changes" => redirect("/wiki_page_versions")
   match "/wiki/history/:title" => redirect("/wiki_page_versions?title=%{title}")
 
diff --git a/lib/danbooru/paginator/active_record_extension.rb b/lib/danbooru/paginator/active_record_extension.rb
index ca5da06f6..608416c31 100644
--- a/lib/danbooru/paginator/active_record_extension.rb
+++ b/lib/danbooru/paginator/active_record_extension.rb
@@ -54,7 +54,7 @@ module Danbooru
           page = [page.to_i, 1].max
           
           if page > Danbooru.config.max_numbered_pages
-            raise PaginationError.new("You cannot go beyond page #{Danbooru.config.max_numbered_pages}. Please narrow your search terms.")
+            raise ::Danbooru::Paginator::PaginationError.new("You cannot go beyond page #{Danbooru.config.max_numbered_pages}. Please narrow your search terms.")
           end
           
           limit(records_per_page).offset((page - 1) * records_per_page).tap do |obj|