diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
old mode 100644
new mode 100755
index 6c0cd3e..2edf556
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -281,6 +281,6 @@ private
   end
 
   def retrieve_time_entry_query
-    retrieve_query(TimeEntryQuery, false)
+    retrieve_query(TimeEntryQuery, true)
   end
 end
diff --git a/test/fixtures/queries.yml b/test/fixtures/queries.yml
old mode 100644
new mode 100755
index b92079a..f95c3c8
--- a/test/fixtures/queries.yml
+++ b/test/fixtures/queries.yml
@@ -1,165 +1,176 @@
---- 
-queries_001: 
+---
+queries_001:
   id: 1
   type: IssueQuery
   project_id: 1
   visibility: 2
   name: Multiple custom fields query
   filters: |
-    --- 
-    cf_1: 
-      :values: 
+    ---
+    cf_1:
+      :values:
       - MySQL
       :operator: "="
-    status_id: 
-      :values: 
+    status_id:
+      :values:
       - "1"
       :operator: o
-    cf_2: 
-      :values: 
+    cf_2:
+      :values:
       - "125"
       :operator: "="
 
   user_id: 1
-  column_names: 
-queries_002: 
+  column_names:
+queries_002:
   id: 2
   type: IssueQuery
   project_id: 1
   visibility: 0
   name: Private query for cookbook
   filters: |
-    --- 
-    tracker_id: 
-      :values: 
+    ---
+    tracker_id:
+      :values:
       - "3"
       :operator: "="
-    status_id: 
-      :values: 
+    status_id:
+      :values:
       - "1"
       :operator: o
 
   user_id: 3
-  column_names: 
-queries_003: 
+  column_names:
+queries_003:
   id: 3
   type: IssueQuery
-  project_id: 
+  project_id:
   visibility: 0
   name: Private query for all projects
   filters: |
-    --- 
-    tracker_id: 
-      :values: 
+    ---
+    tracker_id:
+      :values:
       - "3"
       :operator: "="
 
   user_id: 3
-  column_names: 
-queries_004: 
+  column_names:
+queries_004:
   id: 4
   type: IssueQuery
-  project_id: 
+  project_id:
   visibility: 2
   name: Public query for all projects
   filters: |
-    --- 
-    tracker_id: 
-      :values: 
+    ---
+    tracker_id:
+      :values:
       - "3"
       :operator: "="
 
   user_id: 2
-  column_names: 
-queries_005: 
+  column_names:
+queries_005:
   id: 5
   type: IssueQuery
-  project_id: 
+  project_id:
   visibility: 2
   name: Open issues by priority and tracker
   filters: |
-    --- 
-    status_id: 
-      :values: 
+    ---
+    status_id:
+      :values:
       - "1"
       :operator: o
 
   user_id: 1
-  column_names: 
+  column_names:
   sort_criteria: |
-    --- 
+    ---
     - - priority
       - desc
     - - tracker
       - asc
-queries_006: 
+queries_006:
   id: 6
   type: IssueQuery
-  project_id: 
+  project_id:
   visibility: 2
   name: Open issues grouped by tracker
   filters: |
-    --- 
-    status_id: 
-      :values: 
+    ---
+    status_id:
+      :values:
       - "1"
       :operator: o
 
   user_id: 1
-  column_names: 
+  column_names:
   group_by: tracker
   sort_criteria: |
-    --- 
+    ---
     - - priority
       - desc
-queries_007: 
+queries_007:
   id: 7
   type: IssueQuery
   project_id: 2
   visibility: 2
   name: Public query for project 2
   filters: |
-    --- 
-    tracker_id: 
-      :values: 
+    ---
+    tracker_id:
+      :values:
       - "3"
       :operator: "="
 
   user_id: 2
-  column_names: 
-queries_008: 
+  column_names:
+queries_008:
   id: 8
   type: IssueQuery
   project_id: 2
   visibility: 0
   name: Private query for project 2
   filters: |
-    --- 
-    tracker_id: 
-      :values: 
+    ---
+    tracker_id:
+      :values:
       - "3"
       :operator: "="
 
   user_id: 2
-  column_names: 
-queries_009: 
+  column_names:
+queries_009:
   id: 9
   type: IssueQuery
-  project_id: 
+  project_id:
   visibility: 2
   name: Open issues grouped by list custom field
   filters: |
-    --- 
-    status_id: 
-      :values: 
+    ---
+    status_id:
+      :values:
       - "1"
       :operator: o
 
   user_id: 1
-  column_names: 
+  column_names:
   group_by: cf_1
   sort_criteria: |
-    --- 
+    ---
     - - priority
       - desc
-
+queries_010:
+  id: 10
+  type: TimeEntryQuery
+  project_id: 1
+  visibility: 2
+  name: Time entries
+  filters: |
+    ---
+    hours:
+      :values:
+      - "5"
+      :operator: "<="
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
old mode 100644
new mode 100755
index 6af8301..9bc9fd8
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -24,7 +24,7 @@ class TimelogControllerTest < Redmine::ControllerTest
            :trackers, :enumerations, :issue_statuses,
            :custom_fields, :custom_values,
            :projects_trackers, :custom_fields_trackers,
-           :custom_fields_projects
+           :custom_fields_projects, :queries
 
   include Redmine::I18n
 
@@ -952,6 +952,15 @@ class TimelogControllerTest < Redmine::ControllerTest
     assert_select '#sidebar a.selected', :text => query.name
   end
 
+  def test_index_with_query_id_and_project_id_should_set_session_query
+    get :index, :project_id => 1, :query_id => 10
+    assert_response :success
+
+    assert_kind_of Hash, session[:time_entry_query]
+    assert_equal 10, session[:time_entry_query][:id]
+    assert_equal 1, session[:time_entry_query][:project_id]
+  end
+
   def test_index_atom_feed
     get :index, :params => {:project_id => 1, :format => 'atom'}
     assert_response :success