3 files changed, 5 insertions, 4 deletions
diff --git a/app/views/queries/_columns.rhtml b/app/views/queries/_columns.rhtml
index 8d3da7f6a..1a481adae 100644
--- a/app/views/queries/_columns.rhtml
+++ b/app/views/queries/_columns.rhtml
@@ -1,8 +1,8 @@
 <% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
 <legend><%= l(:field_column_names) %></legend>
 
-<%= hidden_field_tag 'query[column_names][]', '' %>
-<table margin=0>
+<%= hidden_field_tag 'query[column_names][]', '', :id => nil %>
+<table>
 	<tr>
 		<td><%= select_tag 'available_columns',
 		          options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index 2465818d8..458d7139e 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -56,7 +56,6 @@ function toggle_multi_select(field) {
 //]]>
 </script>
 
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
 <table width="100%">
 <tr>
 <td>
@@ -100,4 +99,3 @@ function toggle_multi_select(field) {
 </td>
 </tr>
 </table>
-</fieldset>
-\ No newline at end of file
diff --git a/app/views/queries/_form.rhtml b/app/views/queries/_form.rhtml
index 1620d9b05..2d4b96fd1 100644
--- a/app/views/queries/_form.rhtml
+++ b/app/views/queries/_form.rhtml
@@ -16,6 +16,9 @@
       :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
 </div>
 
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
 <%= render :partial => 'queries/filters', :locals => {:query => query}%>
+</fieldset>
+
 <%= render :partial => 'queries/columns', :locals => {:query => query}%>
 </div>