diff -r 0a574315af3e -r 4f746d8966dd app/views/queries/_form.html.erb
--- a/app/views/queries/_form.html.erb
+++ b/app/views/queries/_form.html.erb
@@ -49,7 +49,7 @@
 
 <%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
 <legend><%= l(:field_column_names) %></legend>
-<%= render :partial => 'queries/columns', :locals => {:query => query}%>
+<%= render_query_columns_selection(query) %>
 <% end %>
 
 </div>