diff --git a/queries/trunk/app/controllers/projects_controller.rb b/queries/trunk/app/controllers/projects_controller.rb
index d912f35aa..92025921d 100644
--- a/queries/trunk/app/controllers/projects_controller.rb
+++ b/queries/trunk/app/controllers/projects_controller.rb
@@ -208,10 +208,15 @@ class ProjectsController < ApplicationController
     sort_init 'issues.id', 'desc'
     sort_update
 
-    @query = Query.new
-    params[:fields].each do |field|
-      @query.add_filter(field, params[:operators][field], params[:values][field])
-    end if params[:fields]
+    session[:query] = nil if params[:set_filter]
+    @query = session[:query] || Query.new
+    if params[:fields] and params[:fields].is_a? Array
+      @query.filters = {}
+      params[:fields].each do |field|
+        @query.add_filter(field, params[:operators][field], params[:values][field])
+      end
+    end
+    session[:query] = @query
 
     @results_per_page_options = [ 15, 25, 50, 100 ]
     if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i
@@ -237,11 +242,11 @@ class ProjectsController < ApplicationController
     sort_init 'issues.id', 'desc'
     sort_update
 
-    search_filter_init_list_issues
+    @query = session[:query] || Query.new
 					
     @issues =  Issue.find :all, :order => sort_clause,
 						:include => [ :author, :status, :tracker, :project, :custom_values ],
-						:conditions => search_filter_clause							
+						:conditions => @query.statement				
 
     ic = Iconv.new('ISO-8859-1', 'UTF-8')    
     export = StringIO.new
@@ -270,11 +275,11 @@ class ProjectsController < ApplicationController
     sort_init 'issues.id', 'desc'
     sort_update
 
-    search_filter_init_list_issues
+    @query = session[:query] || Query.new
 					
     @issues =  Issue.find :all, :order => sort_clause,
 						:include => [ :author, :status, :tracker, :project, :custom_values ],
-						:conditions => search_filter_clause
+						:conditions => @query.statement
 											
     @options_for_rfpdf ||= {}
     @options_for_rfpdf[:file_name] = "export.pdf"
diff --git a/queries/trunk/app/models/query.rb b/queries/trunk/app/models/query.rb
index 8201d08bd..8e826da53 100644
--- a/queries/trunk/app/models/query.rb
+++ b/queries/trunk/app/models/query.rb
@@ -1,7 +1,7 @@
 class Query < ActiveRecord::Base
   serialize :filters
   
-  validates_presence_of :name
+  validates_presence_of :name, :on => :save
     
   @@operators = { "="   => "Egal", 
                   "!"   => "Different",
@@ -56,7 +56,7 @@ class Query < ActiveRecord::Base
   
   def add_filter(field, operator, values)
     # values must be an array
-    return unless values and values.is_a? Array
+    return unless values and values.is_a? Array # and !values.first.empty?
     # check if field is defined as an available filter
     if @@available_filters.has_key? field
       filter_options = @@available_filters[field]
diff --git a/queries/trunk/app/views/projects/list_issues.rhtml b/queries/trunk/app/views/projects/list_issues.rhtml
index 92f726532..b4dff2c9c 100644
--- a/queries/trunk/app/views/projects/list_issues.rhtml
+++ b/queries/trunk/app/views/projects/list_issues.rhtml
@@ -7,12 +7,20 @@
 </small>
 </div>
 
-<div>
 <%= start_form_tag :action => 'list_issues' %>
 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+<table width="100%">
+<tr>
+<td align="right">
 <%= submit_tag l(:button_apply), :class => "button-small" %>
 <%= end_form_tag %>
-</div>
+<%= start_form_tag :action => 'list_issues', :set_filter => 1 %>
+<%= submit_tag l(:button_clear), :class => "button-small" %>
+<%= end_form_tag %>
+</td>
+</tr>
+</table>
+
  &nbsp;
 <table class="listTableContent">
     <tr>
diff --git a/queries/trunk/app/views/queries/_filters.rhtml b/queries/trunk/app/views/queries/_filters.rhtml
index 8d84b5617..f98f53de1 100644
--- a/queries/trunk/app/views/queries/_filters.rhtml
+++ b/queries/trunk/app/views/queries/_filters.rhtml
@@ -1,5 +1,21 @@
 <script>
 
+function add_filter() {
+    select = $('add_filter_select');
+    field = select.value
+    Element.show('tr_' +  field);
+    check_box = $('cb_' + field);
+    check_box.checked = true;
+    toggle_filter(field);
+    select.selectedIndex = 0;
+    
+    for (i=0; i<select.options.length; i++) {
+        if (select.options[i].value == field) {
+            select.options[i].disabled = true;
+        }    
+    }
+}
+
 function toggle_filter(field) {
     check_box = $('cb_' + field);
     
@@ -39,12 +55,15 @@ function toggle_multi_select(field) {
 
 </script>
 
-<fieldset><legend>Filtres</legend>
+<fieldset style="margin:0;"><legend>Filtres</legend>
+<table width="100%" cellpadding=0 cellspacing=0>
+<tr>
+<td>
 <table>
 <% Query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
     <% field = filter[0]
        options = filter[1] %>
-    <tr>
+    <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>">
     <td valign="top" width="200">
         <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
         <label for="cb_<%= field %>"><%= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
@@ -59,7 +78,7 @@ function toggle_multi_select(field) {
         <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %>" name="values[<%= field %>][]" id="values[<%= field %>][]" class="select-small" style="vertical-align: top;">
         <%= options_for_select options[:values], query.values_for(field) %>        
         </select>
-        <%= link_to_function '+', "toggle_multi_select('#{field}');" %>
+        <%= link_to_function image_tag('expand'), "toggle_multi_select('#{field}');" %>
     <% when :date, :date_past %>
         <%= text_field_tag "values[#{field}][]", query.values_for(field), :size => 3, :class => "select-small" %> jours
     <% end %>
@@ -69,4 +88,11 @@ function toggle_multi_select(field) {
     <script>toggle_filter('<%= field %>');</script>
 <% end %>
 </table>
+</td>
+<td align="right" valign="top">
+Add filter:
+<%= select_tag 'add_filter_select', options_for_select([["",""]] + Query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %>
+</td>
+</tr>
+</table>
 </fieldset>
\ No newline at end of file
diff --git a/queries/trunk/public/images/expand.png b/queries/trunk/public/images/expand.png
new file mode 100644
index 000000000..3e3aaa441
Binary files /dev/null and b/queries/trunk/public/images/expand.png differ
diff --git a/queries/trunk/public/stylesheets/application.css b/queries/trunk/public/stylesheets/application.css
index 9c05dfe4b..cac98919c 100644
--- a/queries/trunk/public/stylesheets/application.css
+++ b/queries/trunk/public/stylesheets/application.css
@@ -247,7 +247,7 @@ legend {
 
 table.listTableContent {
 	border:1px solid #578bb8;
-	width:99%;
+	width:100%;
 	border-collapse: collapse;
 }