1 files changed, 7 insertions, 4 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 1d1a1ca..cdfe564 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -20,13 +20,17 @@ class AdminController < ApplicationController
   end
   
   def search
-    @results = Node.search params[:search_term]
+    @results = Node.search params[:search_term], :per_page => 1000
     
     respond_to do |format|
-      format.html
+      format.html do
+        render :template => 'admin/search_results.html'
+      end
       format.js do 
         render( :json => @results.map do |node| 
-          {:id => node.id, :title => node.title, :edit_path => node_path(node)} 
+            if node
+              {:id => node.id, :title => node.title, :edit_path => node_path(node)}
+            end
           end
         )
         
@@ -46,7 +50,6 @@ class AdminController < ApplicationController
         render :partial => 'admin/menu_search_results'
       end
       
-      
       format.js do 
         render( :json => @results.map do |node| 
           {:node_id => node.id, :title => node.title, :unique_name => node.unique_name}