diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 5e78e3f98..43d01a5dd 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -255,7 +255,7 @@ module QueriesHelper
       # Give it a name, required to be valid
       @query = IssueQuery.new(:name => "_")
       @query.project = @project
-      params[:f] = %w(subject status_id priority_id author_id assigned_to_id) unless params[:status_id].nil?
+      params[:f] = %w(subject status_id priority_id author_id assigned_to_id created_on) unless params[:status_id].nil?
       params[:op] = {'subject' => "~" ,
                      'status_id' => ( params[:status_id] == '0' ? "!":"=" ),
                      'priority_id' => ( params[:priority_id] == '0' ? "!":"=" ),
@@ -266,19 +266,22 @@ module QueriesHelper
                     'priority_id' => [params[:priority_id]],
                     'author_id' => [params[:author_id]],
                     'assigned_to_id' => [params[:assigned_to_id]]} unless params[:status_id].nil?
-      # if(params[:status_id] != nil)
-      #   if( params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='' &&
-      #       params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='' )
-      #     params[:op][:created_on]='><'
-      #     params[:v][:created_on]=[params[:issue_create_date_start],params[:issue_create_date_end]]
-      #   elsif(params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='')
-      #     params[:op][:created_on]='>='
-      #     params[:v][:created_on]=[params[:issue_create_date_start]]
-      #   elsif(params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='')
-      #     params[:op][:created_on]='<='
-      #     params[:v][:created_on]=[params[:issue_create_date_end]]
-      #   end
-      # end
+      if(params[:status_id] != nil)
+        if( params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='' &&
+            params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='' )
+          params[:op][:created_on]='><'
+          params[:v][:created_on]=[params[:issue_create_date_start],params[:issue_create_date_end]]
+        elsif(params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='')
+          params[:op][:created_on]='>='
+          params[:v][:created_on]=[params[:issue_create_date_start]]
+        elsif(params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='')
+          params[:op][:created_on]='<='
+          params[:v][:created_on]=[params[:issue_create_date_end]]
+        else
+          params[:op][:created_on]='!'
+          params[:v][:created_on]=''
+        end
+      end
       @query.build_from_params(params)
       #session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
     # else