diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 19c5470..25a88de 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -20,7 +20,7 @@
     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
   </div>
 </fieldset>
-<fieldset class="collapsible collapsed">
+<fieldset id="options" class="collapsible collapsed">
   <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
   <div style="display: none;">
     <table>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index b957921..e1be10a 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -20,16 +20,16 @@
         <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
       </div>
     </fieldset>
-    <fieldset class="collapsible collapsed">
+    <fieldset id="options" class="collapsible collapsed">
       <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
       <div style="display: none;">
         <table>
           <tr>
-            <td><%= l(:field_column_names) %></td>
+            <td class="field"><%= l(:field_column_names) %></td>
             <td><%= render_query_columns_selection(@query) %></td>
           </tr>
           <tr>
-            <td><label for='group_by'><%= l(:field_group_by) %></label></td>
+            <td class="field"><label for='group_by'><%= l(:field_group_by) %></label></td>
             <td><%= select_tag('group_by',
                                options_for_select(
                                  [[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]},
@@ -37,7 +37,7 @@
                        ) %></td>
           </tr>
           <tr>
-            <td><%= l(:button_show) %></td>
+            <td class="field"><%= l(:button_show) %></td>
             <td><%= available_block_columns_tags(@query) %></td>
           </tr>
         </table>
diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb
index 0fc8500..eaca195 100644
--- a/app/views/queries/_form.html.erb
+++ b/app/views/queries/_form.html.erb
@@ -24,7 +24,7 @@
       :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>

 <% unless params[:gantt] %>
-<fieldset><legend><%= l(:label_options) %></legend>
+<fieldset id="options"><legend><%= l(:label_options) %></legend>
 <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
 <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
       :onclick => 'if (this.checked) {$("#columns").hide();} else {$("#columns").show();}' %></p>
@@ -36,7 +36,7 @@
 <%= available_block_columns_tags(@query) %></p>
 </fieldset>
 <% else %>
-<fieldset><legend><%= l(:label_options) %></legend>
+<fieldset id="options"><legend><%= l(:label_options) %></legend>
   <p><label><%= l(:button_show) %></label>
   <label class="inline"><%= check_box_tag "query[draw_relations]", "1", @query.draw_relations %> <%= l(:label_related_issues) %></label>
   <label class="inline"><%= check_box_tag "query[draw_progress_line]", "1", @query.draw_progress_line %> <%= l(:label_gantt_progress_line) %></label>
diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb
index 0c72012..fd013f0 100644
--- a/app/views/timelog/_date_range.html.erb
+++ b/app/views/timelog/_date_range.html.erb
@@ -6,12 +6,12 @@
       <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
     </div>
   </fieldset>
-  <fieldset class="collapsible collapsed">
+  <fieldset id="options" class="collapsible collapsed">
     <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
     <div style="display: none;">
       <table>
         <tr>
-          <td><%= l(:field_column_names) %></td>
+          <td class="field"><%= l(:field_column_names) %></td>
           <td><%= render_query_columns_selection(@query) %></td>
         </tr>
       </table>