diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb
index ae5597134..cea18cf73 100644
--- a/app/models/issue_query.rb
+++ b/app/models/issue_query.rb
@@ -82,7 +82,7 @@ class IssueQuery < Query
 
   def initialize_available_filters
     add_available_filter "status_id",
-      :type => :list_status, :values => lambda { issue_statuses }
+      :type => :list_status, :values => lambda { issue_statuses_values }
 
     add_available_filter("project_id",
       :type => :list, :values => lambda { project_values }
diff --git a/app/models/query.rb b/app/models/query.rb
index 7d6b37f36..4894a0958 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -552,7 +552,7 @@ class Query < ActiveRecord::Base
   end
 
   # Returns a scope of issue statuses that are available as columns for filters
-  def issue_statuses
+  def issue_statuses_values
     if project
       statuses = project.rolled_up_statuses
     else
diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb
index 0502c4112..68640e7ed 100644
--- a/app/models/time_entry_query.rb
+++ b/app/models/time_entry_query.rb
@@ -56,11 +56,11 @@ class TimeEntryQuery < Query
     add_available_filter("issue.tracker_id",
       :type => :list,
       :name => l("label_attribute_of_issue", :name => l(:field_tracker)),
-      :values => lambda { Tracker.sorted.map {|t| [t.name, t.id.to_s]} })
+      :values => lambda { trackers.map {|t| [t.name, t.id.to_s]} })
     add_available_filter("issue.status_id",
       :type => :list,
       :name => l("label_attribute_of_issue", :name => l(:field_status)),
-      :values => lambda { IssueStatus.sorted.map {|s| [s.name, s.id.to_s]} })
+      :values => lambda { issue_statuses_values })
     add_available_filter("issue.fixed_version_id",
       :type => :list,
       :name => l("label_attribute_of_issue", :name => l(:field_fixed_version)),