diff --git a/assets/javascripts/reporting.js b/assets/javascripts/reporting.js
index 83952fc222..5379f828ef 100644
--- a/assets/javascripts/reporting.js
+++ b/assets/javascripts/reporting.js
@@ -1,366 +1,342 @@
-/*global $, selectAllOptions, moveOptions */
-
-function make_select_accept_multiple_values(select) {
-    select.multiple = true;
-    select.size = 4;
-    // first option just got selected, because THAT'S the kind of world we live in
-    select.options[0].selected = false;
-}
-
-function make_select_accept_single_value(select) {
-    select.multiple = false;
-    select.size = 1;
-}
-
-function toggle_multi_select(select) {
-    if (select.multiple === true) {
-        make_select_accept_single_value(select);
-    } else {
-        make_select_accept_multiple_values(select);
-    }
-}
-
-function change_argument_visibility(field, arg_nr) {
-    var params, i;
-    params = [$(field + '_arg_1'), $(field + '_arg_2')];
-
-    for (i = 0; i < 2; i += 1) {
-        if (params[i] !== null) {
-            if (arg_nr >= (i + 1) || arg_nr <= (-1 - i)) {
-                params[i].show();
-            }
-            else {
-                params[i].hide();
-            }
-        }
-    }
-}
-
-function operator_changed(field, select) {
-    var option_tag, arity;
-    if (select === null) {
-        return;
-    }
-    option_tag = select.options[select.selectedIndex];
-    arity = parseInt(option_tag.getAttribute("data-arity"), 10);
-    change_argument_visibility(field, arity);
-}
-
-function display_category(tr_field) {
-    var label = $(tr_field.getAttribute("data-label"));
-    if (label !== null) {
-        label.show();
-    }
-}
-
-function hide_category(tr_field) {
-    var label = $(tr_field.getAttribute("data-label"));
-    if (label !== null) {
-        label.hide();
-    }
-}
-
-function set_remove_button_visibility(field, value) {
-    var remove = $('rm_' + field);
-    if (remove !== null) {
-        if (value === true) {
-            remove.show();
-        } else {
-            remove.hide();
-        }
-    }
-}
-
-function load_available_values_for_filter(filter_name, callback_func) {
-    var select;
-    select = $('' + filter_name + '_arg_1_val');
-    if (select !== null && select.readAttribute('data-loading') === "ajax" && select.childElements().length === 0) {
-        new Ajax.Updater({ success: select }, window.global_prefix + '/cost_reports/available_values', {
-            parameters: { filter_name: filter_name },
-            insertion: 'bottom',
-            evalScripts: false,
-            onCreate: function (a, b) {
-                $('operators_' + filter_name).disable();
-                $('' + filter_name + '_arg_1_val').disable();
-            },
-            onComplete: function (a, b) {
-                $('operators_' + filter_name).enable();
-                $('' + filter_name + '_arg_1_val').enable();
-                callback_func();
-            }
-        });
-        make_select_accept_single_value(select);
-    }
-    else {
-        callback_func();
-    }
-}
-
-function show_filter_callback(field, slowly, callback_func) {
-    var field_el = $('tr_' +  field);
-    if (field_el !== null) {
-        load_available_values_for_filter(field, callback_func);
-        // the following command might be included into the callback_function (which is called after the ajax request) later
-        $('rm_' + field).value = field;
-        if (slowly) {
-            new Effect.Appear(field_el);
-        } else {
-            field_el.show();
-        }
-        operator_changed(field, $("operators_" + field));
-        display_category(field_el);
+/*
+jslint nomen: true, debug: false, evil: false,
+    onevar: false, browser: true, white: false, indent: 0
+*/
+
+window.Reporting = {
+  source: ($$("head")[0].select("script[src*='reporting.js']")[0].src),
+
+  require: function(libraryName) {
+    alert("loading "+ libraryName);
+    jsName = Reporting.source.replace("reporting.js", "reporting/" + libraryName + ".js");
+    try {
+      // inserting via DOM fails in Safari 2.0, so brute force approach
+      document.write('<script type="text/javascript" src="' + jsName + '"><\/script>');
+    } catch(e) {
+      // for xhtml+xml served content, fall back to DOM methods
+      var script = document.createElement('script');
+      script.type = 'text/javascript';
+      script.src = jsName;
+      document.getElementsByTagName('head')[0].appendChild(script);
     }
-}
-
-function show_filter(field) {
-    show_filter_callback(field, true, function () {});
-}
-
-function occupied_category(tr_field) {
-    var i, data_label, filters;
-    data_label = tr_field.getAttribute("data-label");
-    filters = document.getElementsByClassName('filter');
-    for (i = 0; i < filters.length; i += 1) {
-        if (filters[i].visible() && filters[i].getAttribute("data-label") === data_label) {
-            return true;
-        }
-    }
-    return false; //not hit
-}
-
-function hide_filter(field, slowly) {
-    var field_el, operator_select;
-    field_el = $('tr_' +  field);
-    if (field_el !== null) {
-        $('rm_' + field).value = "";
-        if (slowly) {
-            new Effect.Fade(field_el);
-        } else {
-            field_el.hide();
-        }
-        operator_select = $("operators_" + field);
-        if (operator_select !== null) {
-            // in case the filter doesn't have an operator select field'
-            operator_changed(field, $("operators_" + field));
-        }
-        if (!occupied_category(field_el)) {
-            hide_category(field_el);
-        }
-    }
-}
-
-function disable_select_option(select, field) {
-    for (var i = 0; i < select.options.length; i += 1) {
-        if (select.options[i].value === field) {
-            select.options[i].disabled = true;
-            break;
-        }
-    }
-}
-
-function enable_select_option(select, field) {
-    for (var i = 0; i < select.options.length; i += 1) {
-        if (select.options[i].value === field) {
-            select.options[i].disabled = false;
-            break;
-        }
-    }
-}
-
-function add_filter(select) {
-    var field;
-    field = select.value;
-    show_filter(field);
-    select.selectedIndex = 0;
-    disable_select_option(select, field);
-}
-
-function remove_filter(field) {
-    hide_filter(field, true);
-    enable_select_option($("add_filter_select"), field);
-}
-
-function show_group_by(group_by, target) {
-    var source, group_option, i;
-    source = $("group_by_container");
-    group_option = null;
-    // find group_by option-tag in target select-box
-    for (i = 0; i < source.options.length; i += 1) {
-        if (source.options[i].value === group_by) {
-            group_option = source.options[i];
-            source.options[i] = null;
-            break;
-        }
-    }
-    // die if the appropriate option-tag can not be found
-    if (group_option === null) {
-        return;
-    }
-    // move the option-tag to the taget select-box while keepings its data
-    target.options[target.length] = group_option;
-}
-
-function select_operator(field, operator) {
-    var select, i;
-    select = $("operators_" + field);
-    if (select === null) {
-        return; // there is no such operator select field
-    }
-    for (i = 0; i < select.options.length; i += 1) {
-        if (select.options[i].value === operator) {
-            select.selectedIndex = i;
-            break;
-        }
-    }
-    operator_changed(field, select);
-}
-
-function restore_select_values(select, values) {
-    var i, j;
-    if (values.length > 1) {
-        make_select_accept_multiple_values(select);
-    } else {
-        make_select_accept_single_value(select);
-    }
-    for (i = 0; i < values.length; i += 1) {
-        for (j = 0; j < select.options.length; j += 1) {
-            if (select.options[j].value === values[i].toString()) {
-                try {
-                    select.options[j].selected = true;
-                    break;
-                } catch(e) {
-                    window.setTimeout('$("' + select.id + '").childElements()[' + j + '].selected = true;', 1);
-                }
-            }
-        }
-    }
-}
-
-function find_arguments(field) {
-    var args = [], arg_count = 0, arg = null;
-    arg = $(field + '_arg_' + (arg_count + 1) + '_val');
-    while (arg !== null) {
-        args[args.length] = arg;
-        arg_count = arg_count + 1;
-        arg = $(field + '_arg_' + (arg_count + 1) + '_val');
-    }
-    return args;
-}
-
-function restore_values(field, values) {
-    var op_select, op_arity, args, i;
-    op_select = $("operators_" + field);
-    if (op_select !== null) {
-        op_arity = op_select.options[op_select.selectedIndex].getAttribute("data-arity");
-    }
-    else {
-        op_arity = 0;
-    }
-    args = find_arguments(field);
-    if (args.size() === 0) {
-        return; // there are no values to set
-    }
-    if (!Object.isArray(values)) {
-        values = [values];
-    }
-    if (op_arity < 0 && !(args[0].type.empty()) && args[0].type.include('select')) {
-        restore_select_values(args[0], values);
-    } else {
-        for (i = 0; i < values.length && i < args.length; i += 1) {
-            args[i].setValue(values[i]);
-        }
-    }
-}
-
-function restore_filter(field, operator, values) {
-    select_operator(field, operator);
-    disable_select_option($("add_filter_select"), field);
-    show_filter_callback(field, true, function () {
-        if (typeof(values) !== "undefined") {
-            restore_values(field, values);
-        }
-    });
-}
-
-function show_group_by_column(group_by) {
-    show_group_by(group_by, $('group_by_columns'));
-}
-
-function show_group_by_row(group_by) {
-    show_group_by(group_by, $('group_by_rows'));
-}
-
-function disable_all_filters() {
-    $('filter_table').down().childElements().each(function (e) {
-        var field, possible_select;
-        e.hide();
-        if (e.readAttribute('class') === 'filter') {
-            field = e.id.gsub('tr_', '');
-            hide_filter(field, false);
-            enable_select_option($('add_filter_select'), field);
-            possible_select = $(field + '_arg_1_val');
-            if (possible_select !== null && possible_select.type && possible_select.type.include('select')) {
-                make_select_accept_single_value(possible_select);
-            }
-        }
-    });
-}
-
-function disable_all_group_bys() {
-    var destination;
-    destination = $('group_by_container');
-    [$('group_by_columns'), $('group_by_rows')].each(function (origin) {
-        selectAllOptions(origin);
-        moveOptions(origin, destination);
-    });
-}
-
-function serialize_filter_and_group_by() {
-    var ret_str, rows, columns;
-    ret_str = Form.serialize('query_form');
-    rows = Sortable.serialize('group_rows');
-    columns = Sortable.serialize('group_columns');
-    if (rows !== null && rows !== "") {
-        ret_str += "&" + rows;
-    }
-    if (columns !== null && columns !== "") {
-        ret_str += "&" + columns;
-    }
-    return ret_str;
-}
-
-function init_group_bys() {
-    var options = {
-        tag: 'span',
-        overlap: 'horizontal',
-        constraint: 'horizontal',
-        containment: ['group_columns', 'group_rows'],
-        //only: "group_by",
-        dropOnEmpty: true,
-        format: /^(.*)$/,
-        hoverclass: 'drag_container_accept'
-    };
-    Sortable.create('group_columns', options);
-    Sortable.create('group_rows', options);
-}
-
-function defineElementGetter() {
-    if (document.getElementsByClassName === undefined) {
-        document.getElementsByClassName = function (className)
-        {
-            var hasClassName, allElements, results, element, elementClass, i;
-            hasClassName = new RegExp("(?:^|\\s)" + className + "(?:$|\\s)");
-            allElements = document.getElementsByTagName("*");
-            results = [];
-            for (i = 0; (element = allElements[i]) !== null; i += 1) {
-                elementClass = element.className;
-                if (elementClass && elementClass.indexOf(className) !== -1 && hasClassName.test(elementClass)) {
-                    results.push(element);
-                }
-            }
-            return results;
-        };
-    }
-}
-
-defineElementGetter();
+  },
+
+  onload: function(func) {
+    document.observe("dom:loaded", func);
+  }
+};
+
+Reporting.require("filters");
+Reporting.require("group_bys");
+Reporting.require("restore_query");
+
+//
+// /*global $, selectAllOptions, moveOptions */
+//
+// function make_select_accept_multiple_values(select) {
+//     select.multiple = true;
+//     select.size = 4;
+//     // first option just got selected, because THAT'S the kind of world we live in
+//     select.options[0].selected = false;
+// }
+//
+// function make_select_accept_single_value(select) {
+//     select.multiple = false;
+//     select.size = 1;
+// }
+//
+// function toggle_multi_select(select) {
+//     if (select.multiple === true) {
+//         make_select_accept_single_value(select);
+//     } else {
+//         make_select_accept_multiple_values(select);
+//     }
+// }
+//
+// function change_argument_visibility(field, arg_nr) {
+//     var params, i;
+//     params = [$(field + '_arg_1'), $(field + '_arg_2')];
+//
+//     for (i = 0; i < 2; i += 1) {
+//         if (params[i] !== null) {
+//             if (arg_nr >= (i + 1) || arg_nr <= (-1 - i)) {
+//                 params[i].show();
+//             }
+//             else {
+//                 params[i].hide();
+//             }
+//         }
+//     }
+// }
+//
+// function operator_changed(field, select) {
+//     var option_tag, arity;
+//     if (select === null) {
+//         return;
+//     }
+//     option_tag = select.options[select.selectedIndex];
+//     arity = parseInt(option_tag.getAttribute("data-arity"), 10);
+//     change_argument_visibility(field, arity);
+// }
+//
+// function display_category(tr_field) {
+//     var label = $(tr_field.getAttribute("data-label"));
+//     if (label !== null) {
+//         label.show();
+//     }
+// }
+//
+// function hide_category(tr_field) {
+//     var label = $(tr_field.getAttribute("data-label"));
+//     if (label !== null) {
+//         label.hide();
+//     }
+// }
+//
+// function set_remove_button_visibility(field, value) {
+//     var remove = $('rm_' + field);
+//     if (remove !== null) {
+//         if (value === true) {
+//             remove.show();
+//         } else {
+//             remove.hide();
+//         }
+//     }
+// }
+//
+// function load_available_values_for_filter(filter_name, callback_func) {
+//     var select;
+//     select = $('' + filter_name + '_arg_1_val');
+//     if (select !== null && select.readAttribute('data-loading') === "ajax" && select.childElements().length === 0) {
+//         new Ajax.Updater({ success: select }, window.global_prefix + '/cost_reports/available_values', {
+//             parameters: { filter_name: filter_name },
+//             insertion: 'bottom',
+//             evalScripts: false,
+//             onCreate: function (a, b) {
+//                 $('operators_' + filter_name).disable();
+//                 $('' + filter_name + '_arg_1_val').disable();
+//             },
+//             onComplete: function (a, b) {
+//                 $('operators_' + filter_name).enable();
+//                 $('' + filter_name + '_arg_1_val').enable();
+//                 callback_func();
+//             }
+//         });
+//         make_select_accept_single_value(select);
+//     }
+//     else {
+//         callback_func();
+//     }
+// }
+//
+// function show_filter_callback(field, slowly, callback_func) {
+//     var field_el = $('tr_' +  field);
+//     if (field_el !== null) {
+//         load_available_values_for_filter(field, callback_func);
+//         // the following command might be included into the callback_function (which is called after the ajax request) later
+//         $('rm_' + field).value = field;
+//         if (slowly) {
+//             new Effect.Appear(field_el);
+//         } else {
+//             field_el.show();
+//         }
+//         operator_changed(field, $("operators_" + field));
+//         display_category(field_el);
+//     }
+// }
+//
+// function show_filter(field) {
+//     show_filter_callback(field, true, function () {});
+// }
+//
+// function occupied_category(tr_field) {
+//     var i, data_label, filters;
+//     data_label = tr_field.getAttribute("data-label");
+//     filters = document.getElementsByClassName('filter');
+//     for (i = 0; i < filters.length; i += 1) {
+//         if (filters[i].visible() && filters[i].getAttribute("data-label") === data_label) {
+//             return true;
+//         }
+//     }
+//     return false; //not hit
+// }
+//
+// function hide_filter(field, slowly) {
+//     var field_el, operator_select;
+//     field_el = $('tr_' +  field);
+//     if (field_el !== null) {
+//         $('rm_' + field).value = "";
+//         if (slowly) {
+//             new Effect.Fade(field_el);
+//         } else {
+//             field_el.hide();
+//         }
+//         operator_select = $("operators_" + field);
+//         if (operator_select !== null) {
+//             // in case the filter doesn't have an operator select field'
+//             operator_changed(field, $("operators_" + field));
+//         }
+//         if (!occupied_category(field_el)) {
+//             hide_category(field_el);
+//         }
+//     }
+// }
+//
+// function disable_select_option(select, field) {
+//     for (var i = 0; i < select.options.length; i += 1) {
+//         if (select.options[i].value === field) {
+//             select.options[i].disabled = true;
+//             break;
+//         }
+//     }
+// }
+//
+// function enable_select_option(select, field) {
+//     for (var i = 0; i < select.options.length; i += 1) {
+//         if (select.options[i].value === field) {
+//             select.options[i].disabled = false;
+//             break;
+//         }
+//     }
+// }
+//
+// function add_filter(select) {
+//     var field;
+//     field = select.value;
+//     show_filter(field);
+//     select.selectedIndex = 0;
+//     disable_select_option(select, field);
+// }
+//
+// function remove_filter(field) {
+//     hide_filter(field, true);
+//     enable_select_option($("add_filter_select"), field);
+// }
+//
+// function show_group_by(group_by, target) {
+//     var source, group_option, i;
+//     source = $("group_by_container");
+//     group_option = null;
+//     // find group_by option-tag in target select-box
+//     for (i = 0; i < source.options.length; i += 1) {
+//         if (source.options[i].value === group_by) {
+//             group_option = source.options[i];
+//             source.options[i] = null;
+//             break;
+//         }
+//     }
+//     // die if the appropriate option-tag can not be found
+//     if (group_option === null) {
+//         return;
+//     }
+//     // move the option-tag to the taget select-box while keepings its data
+//     target.options[target.length] = group_option;
+// }
+//
+//
+// function restore_select_values(select, values) {
+//     var i, j;
+//     if (values.length > 1) {
+//         make_select_accept_multiple_values(select);
+//     } else {
+//         make_select_accept_single_value(select);
+//     }
+//     for (i = 0; i < values.length; i += 1) {
+//         for (j = 0; j < select.options.length; j += 1) {
+//             if (select.options[j].value === values[i].toString()) {
+//                 try {
+//                     select.options[j].selected = true;
+//                     break;
+//                 } catch(e) {
+//                     window.setTimeout('$("' + select.id + '").childElements()[' + j + '].selected = true;', 1);
+//                 }
+//             }
+//         }
+//     }
+// }
+//
+// function find_arguments(field) {
+//     var args = [], arg_count = 0, arg = null;
+//     arg = $(field + '_arg_' + (arg_count + 1) + '_val');
+//     while (arg !== null) {
+//         args[args.length] = arg;
+//         arg_count = arg_count + 1;
+//         arg = $(field + '_arg_' + (arg_count + 1) + '_val');
+//     }
+//     return args;
+// }
+//
+// function restore_values(field, values) {
+//     var op_select, op_arity, args, i;
+//     op_select = $("operators_" + field);
+//     if (op_select !== null) {
+//         op_arity = op_select.options[op_select.selectedIndex].getAttribute("data-arity");
+//     }
+//     else {
+//         op_arity = 0;
+//     }
+//     args = find_arguments(field);
+//     if (args.size() === 0) {
+//         return; // there are no values to set
+//     }
+//     if (!Object.isArray(values)) {
+//         values = [values];
+//     }
+//     if (op_arity < 0 && !(args[0].type.empty()) && args[0].type.include('select')) {
+//         restore_select_values(args[0], values);
+//     } else {
+//         for (i = 0; i < values.length && i < args.length; i += 1) {
+//             args[i].setValue(values[i]);
+//         }
+//     }
+// }
+//
+// function serialize_filter_and_group_by() {
+//     var ret_str, rows, columns;
+//     ret_str = Form.serialize('query_form');
+//     rows = Sortable.serialize('group_rows');
+//     columns = Sortable.serialize('group_columns');
+//     if (rows !== null && rows !== "") {
+//         ret_str += "&" + rows;
+//     }
+//     if (columns !== null && columns !== "") {
+//         ret_str += "&" + columns;
+//     }
+//     return ret_str;
+// }
+//
+// function init_group_bys() {
+//     var options = {
+//         tag: 'span',
+//         overlap: 'horizontal',
+//         constraint: 'horizontal',
+//         containment: ['group_columns', 'group_rows'],
+//         //only: "group_by",
+//         dropOnEmpty: true,
+//         format: /^(.*)$/,
+//         hoverclass: 'drag_container_accept'
+//     };
+//     Sortable.create('group_columns', options);
+//     Sortable.create('group_rows', options);
+// }
+//
+// function defineElementGetter() {
+//     if (document.getElementsByClassName === undefined) {
+//         document.getElementsByClassName = function (className)
+//         {
+//             var hasClassName, allElements, results, element, elementClass, i;
+//             hasClassName = new RegExp("(?:^|\\s)" + className + "(?:$|\\s)");
+//             allElements = document.getElementsByTagName("*");
+//             results = [];
+//             for (i = 0; (element = allElements[i]) !== null; i += 1) {
+//                 elementClass = element.className;
+//                 if (elementClass && elementClass.indexOf(className) !== -1 && hasClassName.test(elementClass)) {
+//                     results.push(element);
+//                 }
+//             }
+//             return results;
+//         };
+//     }
+// }
+//
+// // defineElementGetter();
diff --git a/assets/javascripts/reporting/filters.js b/assets/javascripts/reporting/filters.js
new file mode 100644
index 0000000000..e034d9858c
--- /dev/null
+++ b/assets/javascripts/reporting/filters.js
@@ -0,0 +1,23 @@
+Reporting.Filters = {
+  function show_filter(field, slowly, callback_func) {
+    if (callback_func == undefined) {
+      callback_func = function() {};
+    }
+    if (slowly == undefined) {
+      slowly = true;
+    }
+    var field_el = $('tr_' +  field);
+    if (field_el !== null) {
+        load_available_values_for_filter(field, callback_func);
+        // the following command might be included into the callback_function (which is called after the ajax request) later
+        $('rm_' + field).value = field;
+        if (slowly) {
+            new Effect.Appear(field_el);
+        } else {
+            field_el.show();
+        }
+        operator_changed(field, $("operators_" + field));
+        display_category(field_el);
+    }
+  }
+}
diff --git a/assets/javascripts/reporting/group_bys.js b/assets/javascripts/reporting/group_bys.js
new file mode 100644
index 0000000000..7552830275
--- /dev/null
+++ b/assets/javascripts/reporting/group_bys.js
@@ -0,0 +1,49 @@
+Reporting.GroupBys = {
+  attach_move_button: function(direction) {
+    var btn = $$(".buttons.group_by.move.move" + direction)[0];
+
+    if (direction == "Up" || direction == "Down") {
+      var axis = "columns";
+    } else if (direction == "Left" || direction == "Right") {
+      var axis = "rows";
+    }
+
+    var selected_container = btn.form.select("#group_by_" + axis)[0];
+    var group_by_container = btn.form.group_by_container;
+
+    if (direction == "Down" || direction == "Right") {
+      var source_container = selected_container;
+      var target_container = group_by_container;
+    } else if (direction == "Up" || direction == "Left") {
+      var target_container = selected_container;
+      var source_container = group_by_container;
+    }
+
+    btn.observe("click", function() {
+      moveOptions(source_container, target_container);
+    });
+  },
+
+  attach_sort_button: function(direction, axis) {
+    var btn = $$(".buttons.group_by.sort.sort" + direction + ".sort-" + axis)[0];
+    var box = btn.form.select("#group_by_" + axis)[0];
+    btn.observe("click", function() {
+      if (direction == "Up") {
+        moveOptionUp(box);
+      } else {
+        moveOptionDown(box);
+      }
+    });
+  }
+};
+
+Reporting.onload(function() {
+  ["Left", "Right", "Up", "Down"].each(function(dir) {
+    Reporting.GroupBys.attach_move_button(dir);
+  });
+  ["Up", "Down"].each(function(dir) {
+    ["rows", "columns"].each(function(axis) {
+      Reporting.GroupBys.attach_sort_button(dir, axis);
+    });
+  });
+});
diff --git a/assets/javascripts/reporting/restore_query.js b/assets/javascripts/reporting/restore_query.js
index 410c84ae05..0c3f5fbfba 100644
--- a/assets/javascripts/reporting/restore_query.js
+++ b/assets/javascripts/reporting/restore_query.js
@@ -2,42 +2,80 @@
 jslint Reporting: false, nomen: true, debug: false, evil: false,
     onevar: false, browser: true, white: false, indent: 0
 */
-var Reporting.RestoreQueries = {};
 
-Reporting.RestoreQueries.set_filters = function() {
-  <% sorted_filters = engine::Filter.all.map {|fclass| query.filters.detect {|f| f.class == fclass } }.compact %>
-  <% visible_filters = sorted_filters.select {|f| f.class.display? } %>
-  <% visible_filters.each do |f| %>
-    restore_filter("<%= f.class.underscore_name %>",
-                   "<%= f.operator.to_s %>"<%= "," if f.values %>
-                    <%= f.values.to_json.html_safe if f.values  %>);
-    <% if f.class.has_dependents? %>
-      // Evaluate the dependency observer synchronously. See _multi_values_with_dependent.rhtml for more info
-      <%= "observe_selector_#{f.class.underscore_name}(true);" %>
-    <% end %>
-  <% end %>
-}
+Reporting.RestoreQuery = {
+  restore_filters: function() {
+    group_bys = $('filter_table').select("tr").select(function(row) {
+      return $(row).getAttribute("data-selected") == "true";
+    }).each(function(row) {
+      var field = row.className;
+      Reporting.Filters.show_filter(field);
+      disable_select_option($("add_filter_select"), field);
+    });
+  },
 
-Reporting.RestoreQueries.set_group_bys = function() {
-  // Activate recent group_bys on loading
-  group_bys = $('group_by_container').childElements().collect(function(og) {
-    return $(og).childElements();
-  }).flatten().select(function(group_by) {
-    return $(group_by).hasAttribute("data-selected-axis");
-  }).sortBy(function(group_by) {
-    return $(group_by).getAttribute("data-selected-index");
-  }).each(function(group_by) {
-    var axis = $(group_by).getAttribute("data-selected-axis");
-    var name = $(group_by).getAttribute("value");
-    show_group_by(axis, name);
-  });
-}
+  select_operator: function(field, operator) {
+    var select, i;
+    select = $("operators_" + field);
+    if (select === null) {
+        return; // there is no such operator select field
+    }
+    for (i = 0; i < select.options.length; i += 1) {
+        if (select.options[i].value === operator) {
+            select.selectedIndex = i;
+            break;
+        }
+    }
+    operator_changed(field, select);
+  },
+
+  disable_select_option: function(select, field) {
+    for (var i = 0; i < select.options.length; i += 1) {
+        if (select.options[i].value === field) {
+            select.options[i].disabled = true;
+            break;
+        }
+    }
+  },
 
-Reporting.RestoreQueries.restore_query_inputs = function() {
-  disable_all_filters();
-  disable_all_group_bys();
-  set_filters();
-  set_group_bys();
+  show_group_by: function(group_by, target) {
+    $('group_by_container').select("")
+    var source, group_option, i;
+    source = $("group_by_container");
+    group_option = null;
+    // find group_by option-tag in target select-box
+    for (i = 0; i < source.options.length; i++) {
+        if (source.options[i].value == group_by) {
+            group_option = source.options[i];
+            source.options[i] = null;
+            break;
+        }
+    }
+    // die if the appropriate option-tag can not be found
+    if (group_option === null) {
+        return;
+    }
+    // move the option-tag to the taget select-box while keepings its data
+    target.options[target.length] = group_option;
+  },
+
+  restore_group_bys: function() {
+    // Activate recent group_bys on loading
+    group_bys = $('group_by_container').childElements().collect(function(og) {
+      return $(og).childElements();
+    }).flatten().select(function(group_by) {
+      return $(group_by).hasAttribute("data-selected-axis");
+    }).sortBy(function(group_by) {
+      return $(group_by).getAttribute("data-selected-index");
+    }).each(function(group_by) {
+      var axis = $(group_by).getAttribute("data-selected-axis");
+      var name = $(group_by).getAttribute("value");
+      Reporting.RestoreQuery.show_group_by(name, $('group_by_' + axis + 's'));
+    });
+  }
 }
 
-Reporting.RestoreQueries.restore_query_inputs();
+
+Reporting.onload(function() {
+  Reporting.RestoreQuery.restore_group_bys();
+});
diff --git a/init.rb b/init.rb
index 84dda4f8de..835ebc3d4d 100644
--- a/init.rb
+++ b/init.rb
@@ -2,4 +2,6 @@ fail "upgrade ruby version, ruby < 1.8.7 suffers from Hash#hash bug" if {:a => 1
 #require "hwia_rails"
 
 require 'big_decimal_patch'
-require 'to_date_patch'
\ No newline at end of file
+require 'to_date_patch'
+
+config.middleware.use ::ActionDispatch::Static, "#{root}/assets"
diff --git a/lib/widget/filters.rb b/lib/widget/filters.rb
index 9d2c188266..c0410cc47e 100644
--- a/lib/widget/filters.rb
+++ b/lib/widget/filters.rb
@@ -35,9 +35,15 @@ class Widget::Filters < Widget::Base
   def render_filters
     active_filters = @query.filters.select {|f| f.class.display? }
     engine::Filter.all.collect do |filter|
-      content_tag :tr, :id => "tr_#{filter.underscore_name}",
-          :class => "#{filter.underscore_name}", :style => "display:none" do
-        render_filter filter, active_filters.detect {|f| f.class == filter }
+      opts = :id => "tr_#{filter.underscore_name}", :class => "#{filter.underscore_name}"
+      active_instance = active_filters.detect {|f| f.class == filter }
+      if active_instance
+        opts[:"data-selected"] = true
+      else
+        opts[:style] = "display:none"
+      end
+      content_tag :tr, opts do
+        render_filter filter, active_instance
       end
     end.join.html_safe
   end
diff --git a/lib/widget/group_bys.rb b/lib/widget/group_bys.rb
index ab4bc03f6b..f4a5fb491c 100644
--- a/lib/widget/group_bys.rb
+++ b/lib/widget/group_bys.rb
@@ -66,8 +66,7 @@ class Widget::GroupBys < Widget::Base
   end
 
   def render_sort_button(axis, dir)
-    tag :input, :type => "button", :class => "buttons group_by sort sort#{dir}",
-        :onclick => "moveOption#{dir}(this.form.group_by_#{axis});"
+    tag :input, :type => "button", :class => "buttons group_by sort sort#{dir} sort-#{axis}"
   end
 
   def render_move_buttons(axis, to, from, br = false)
@@ -77,8 +76,7 @@ class Widget::GroupBys < Widget::Base
   end
 
   def render_move_option_button(axis, dir)
-    tag :input, :type => "button", :class => "buttons group_by move move#{dir}",
-        :onclick => "moveOptions(this.form.group_by_container, this.form.group_by_#{axis});"
+    tag :input, :type => "button", :class => "buttons group_by move move#{dir}"
   end
 
   def render_grouped_group_bys
@@ -87,23 +85,28 @@ class Widget::GroupBys < Widget::Base
         l(label)
       end.collect do |label, group_by_ary|
         content_tag :optgroup, :label => l(label), :"data-category" => label.to_s do
-          group_by_ary.sort_by do |g|
-            l(g.label)
-          end.collect do |group_by|
-            next unless group_by.selectable?
-            option_tag_options = {:value => group_by.underscore_name,
-                                  :"data-category" => label.to_s}
-            if grby = @query.group_bys.detect {|g| g.class == group_by }
-              option_tag_options.merge({:"data-selected-axis" => grby.type.to_s})
-              option_tag_options.merge({:"data-selected-index" => @query.group_bys.index(grby)})
-            end
-            content_tag :option, option_tag_options do
-              l(group_by.label)
-            end
-          end.compact.join.html_safe
+          render_group_bys_for(group_by_ary, label)
         end
       end.join.html_safe
     end
   end
 
+  def render_group_bys_for(group_by_ary, label)
+    group_by_ary.sort_by do |g|
+      l(g.label)
+    end.collect do |group_by|
+      next unless group_by.selectable?
+      render_group_by(group_by, :value => group_by.underscore_name, :"data-category" => label.to_s)
+    end.compact.join.html_safe
+  end
+
+  def render_group_by(group_by, option_tag_options)
+    if grby = @query.group_bys.detect {|g| g.class == group_by }
+      option_tag_options[:"data-selected-axis"] = grby.type.to_s
+      option_tag_options[:"data-selected-index"] = @query.group_bys.index(grby)
+    end
+    content_tag :option, option_tag_options do
+      l(group_by.label)
+    end
+  end
 end