2 files changed, 4 insertions, 2 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d9cf1be6..2b35fd20 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -5,7 +5,9 @@ class AdminController < ApplicationController
   before_action :login_required
 
   def index
-    @drafts = Node.drafts_and_autosaves(current_user_id: current_user.id).limit(5)
+    scope         = Node.work_in_progress(current_user_id: current_user.id)
+    @drafts_total = scope.reorder(nil).count
+    @drafts       = scope.includes(:head, :draft, :lock_owner).limit(5)
     @actions = NodeAction.order(:occurred_at => :desc, :id => :desc).limit(5)
   end
 
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 50b30881..2a2cde33 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -231,7 +231,7 @@ class NodesController < ApplicationController
 
   # Filter functions for admin views
   def drafts
-    @nodes = index_matching(Node.drafts_and_autosaves)
+    @nodes = index_matching(Node.work_in_progress)
   end
 
   def mine