diff --git a/.eslintrc.json b/.eslintrc.json
index 41b11df817608..ce2c50f696845 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -13,7 +13,8 @@
         "strict": 1,
         "indent": [
             "error",
-            4
+            4,
+            { "SwitchCase": 1 }
         ],
         "linebreak-style": [
             "error",
diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py
index d38a2db860ad6..144a4485eff3b 100644
--- a/cmk/gui/htmllib.py
+++ b/cmk/gui/htmllib.py
@@ -1444,6 +1444,9 @@ def add_default_stylesheet(self, name):
         if name not in self._default_stylesheets:
             self._default_stylesheets.append(name)
 
+    def clear_default_javascript(self):
+        del self._default_javascripts[:]
+
     def add_default_javascript(self, name):
         if name not in self._default_javascripts:
             self._default_javascripts.append(name)
diff --git a/cmk/gui/plugins/sidebar/quicksearch.py b/cmk/gui/plugins/sidebar/quicksearch.py
index 3423d073f0a88..7c64d19bcaad1 100644
--- a/cmk/gui/plugins/sidebar/quicksearch.py
+++ b/cmk/gui/plugins/sidebar/quicksearch.py
@@ -58,11 +58,14 @@ def description(cls):
                  "<i>hg:</i> Hostgroup, <i>sg:</i> Servicegroup<br><i>ad:</i> Address, <i>al:</i> Alias, <i>tg:</i> Hosttag")
 
     def show(self):
-        html.open_div(id_="mk_side_search", class_="content_center", onclick="mkSearchClose();")
+        html.open_div(
+            id_="mk_side_search", class_="content_center", onclick="cmk.quicksearch.close_popup();")
         html.input(id_="mk_side_search_field", type_="text", name="search", autocomplete="off")
-        html.icon_button("#", _("Search"), "quicksearch", onclick="mkSearchButton();")
+        html.icon_button(
+            "#", _("Search"), "quicksearch", onclick="cmk.quicksearch.on_search_click();")
         html.close_div()
         html.div('', id_="mk_side_clear")
+        html.javascript("cmk.quicksearch.register_search_field('mk_side_search_field');")
 
     @classmethod
     def allowed_roles(cls):
diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py
index 7d4b01def284b..ab83f40371635 100644
--- a/cmk/gui/sidebar.py
+++ b/cmk/gui/sidebar.py
@@ -339,7 +339,9 @@ def show(self):
             interval = config.sidebar_notify_interval
         else:
             interval = 'null'
-        html.html_head(_("Check_MK Sidebar"), stylesheets=["sidebar", "status"])
+        html.clear_default_javascript()
+        html.html_head(
+            _("Check_MK Sidebar"), javascripts=["side"], stylesheets=["sidebar", "status"])
         html.write('<body class="side')
         if config.screenshotmode:
             html.write(" screenshotmode")
diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js
index 42e05ae1967b0..ccdcdbe28ddff 100644
--- a/web/htdocs/js/checkmk.js
+++ b/web/htdocs/js/checkmk.js
@@ -173,28 +173,6 @@ function time() {
     return (new Date()).getTime() / 1000;
 }
 
-// simple implementation of function default arguments when
-// using objects as function parameters. Example:
-// function xxx(args) {
-//     args = merge_args({
-//         'arg2': 'default_val',
-//     });
-// }
-// xxx({
-//   'arg1': 'val1',
-//   'arg3': 'val3',
-// })
-function merge_args()
-{
-    var defaults = arguments[0];
-    var args = arguments[1] || {};
-
-    for (var name in args)
-        defaults[name] = args[name];
-
-    return defaults;
-}
-
 // Tells the caller whether or not there are graphs on the current page
 function has_graphing()
 {
@@ -468,116 +446,6 @@ if (!("lastElementChild" in document.documentElement)) {
 //#   | AJAX call related functions                                        |
 //#   '--------------------------------------------------------------------'
 
-function call_ajax(url, optional_args)
-{
-    var args = merge_args({
-        add_ajax_id      : true,
-        plain_error      : false,
-        response_handler : null,
-        error_handler    : null,
-        handler_data     : null,
-        method           : "GET",
-        post_data        : null,
-        sync             : false
-    }, optional_args);
-
-    var AJAX = window.XMLHttpRequest ? new XMLHttpRequest()
-                                     : new ActiveXObject("Microsoft.XMLHTTP");
-    if (!AJAX)
-        return null;
-
-    // Dynamic part to prevent caching
-    if (args.add_ajax_id) {
-        url += url.indexOf('\?') !== -1 ? "&" : "?";
-        url += "_ajaxid="+Math.floor(Date.parse(new Date()) / 1000);
-    }
-
-    if (args.plain_error) {
-        url += url.indexOf('\?') !== -1 ? "&" : "?";
-        url += "_plain_error=1";
-    }
-
-    try {
-        AJAX.open(args.method, url, !args.sync);
-    } catch (e) {
-        if (args.error_handler) {
-            args.error_handler(args.handler_data, null, e);
-            return null;
-        } else {
-            throw e;
-        }
-    }
-
-    if (args.method == "POST") {
-        AJAX.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-    }
-
-    if (!args.sync) {
-        AJAX.onreadystatechange = function() {
-            if (AJAX && AJAX.readyState == 4) {
-                if (AJAX.status == 200) {
-                    if (args.response_handler)
-                        args.response_handler(args.handler_data, AJAX.responseText);
-                }
-                else if (AJAX.status == 401) {
-                    // This is reached when someone is not authenticated anymore
-                    // but has some webservices running which are still fetching
-                    // infos via AJAX. Reload the whole frameset or only the
-                    // single page in that case.
-                    if(top)
-                        top.location.reload();
-                    else
-                        document.location.reload();
-                }
-                else {
-                    if (args.error_handler)
-                        args.error_handler(args.handler_data, AJAX.status, AJAX.statusText);
-                }
-            }
-        };
-    }
-
-    AJAX.send(args.post_data);
-    return AJAX;
-}
-
-function get_url(url, handler, data, errorHandler, addAjaxId)
-{
-    var args = {
-        response_handler: handler
-    };
-
-    if (typeof data !== 'undefined')
-        args.handler_data = data;
-
-    if (typeof errorHandler !== 'undefined')
-        args.error_handler = errorHandler;
-
-    if (typeof addAjaxId !== 'undefined')
-        args.add_ajax_id = addAjaxId;
-
-    call_ajax(url, args);
-}
-
-function post_url(url, post_params, responseHandler, handler_data, errorHandler)
-{
-    var args = {
-        method: "POST",
-        post_data: post_params
-    };
-
-    if (typeof responseHandler !== 'undefined') {
-        args.response_handler = responseHandler;
-    }
-
-    if (typeof handler_data !== 'undefined')
-        args.handler_data = handler_data;
-
-    if (typeof errorHandler !== 'undefined')
-        args.error_handler = errorHandler;
-
-    call_ajax(url, args);
-}
 
 function bulkUpdateContents(ids, codes)
 {
@@ -929,6 +797,9 @@ function show_pnp_hover_graphs(url)
 
 function handle_check_mk_hover_graphs_response(_unused, code)
 {
+    if (!g_hover_menu)
+        return;
+
     if (code.indexOf('pnp4nagios') !== -1) {
         // fallback to pnp graph handling (received an URL with the previous ajax call)
         show_pnp_hover_graphs(code);
diff --git a/web/htdocs/js/index.js b/web/htdocs/js/index.js
index d0b5dfef4cddd..908f15da2f663 100644
--- a/web/htdocs/js/index.js
+++ b/web/htdocs/js/index.js
@@ -22,21 +22,25 @@
 // to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
 // Boston, MA 02110-1301 USA.
 
+import * as ajax from "ajax";
+import * as prediction from "prediction";
+
 require("script-loader!./checkmk.js");
 require("script-loader!./dashboard.js");
 require("colorpicker");
-var prediction = require("prediction");
-require("script-loader!./search.js");
-require("script-loader!./sidebar.js");
 require("script-loader!./wato.js");
 
 // TODO: Find a better solution for this CEE specific include
 try {
     require("script-loader!../../../enterprise/web/htdocs/js/graphs.js");
-} catch(e) {}
+} catch(e) {} // eslint-disable-line no-empty
 
-module.exports = {
+export default {
+    get_url: ajax.get_url,
+    post_url: ajax.post_url,
+    call_ajax: ajax.call_ajax,
     cmk: {
-        prediction: prediction
+        prediction: prediction,
+        ajax: ajax,
     }
 };
diff --git a/web/htdocs/js/modules/ajax.js b/web/htdocs/js/modules/ajax.js
new file mode 100644
index 0000000000000..5c607ed8f2724
--- /dev/null
+++ b/web/htdocs/js/modules/ajax.js
@@ -0,0 +1,135 @@
+// +------------------------------------------------------------------+
+// |             ____ _               _        __  __ _  __           |
+// |            / ___| |__   ___  ___| | __   |  \/  | |/ /           |
+// |           | |   | '_ \ / _ \/ __| |/ /   | |\/| | ' /            |
+// |           | |___| | | |  __/ (__|   <    | |  | | . \            |
+// |            \____|_| |_|\___|\___|_|\_\___|_|  |_|_|\_\           |
+// |                                                                  |
+// | Copyright Mathias Kettner 2014             mk@mathias-kettner.de |
+// +------------------------------------------------------------------+
+//
+// This file is part of Check_MK.
+// The official homepage is at http://mathias-kettner.de/check_mk.
+//
+// check_mk is free software;  you can redistribute it and/or modify it
+// under the  terms of the  GNU General Public License  as published by
+// the Free Software Foundation in version 2.  check_mk is  distributed
+// in the hope that it will be useful, but WITHOUT ANY WARRANTY;  with-
+// out even the implied warranty of  MERCHANTABILITY  or  FITNESS FOR A
+// PARTICULAR PURPOSE. See the  GNU General Public License for more de-
+// ails.  You should have  received  a copy of the  GNU  General Public
+// License along with GNU Make; see the file  COPYING.  If  not,  write
+// to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
+// Boston, MA 02110-1301 USA.
+
+import { merge_args } from "utils";
+
+export function get_url(url, handler, data, errorHandler, addAjaxId)
+{
+    var args = {
+        response_handler: handler
+    };
+
+    if (typeof data !== "undefined")
+        args.handler_data = data;
+
+    if (typeof errorHandler !== "undefined")
+        args.error_handler = errorHandler;
+
+    if (typeof addAjaxId !== "undefined")
+        args.add_ajax_id = addAjaxId;
+
+    call_ajax(url, args);
+}
+
+export function post_url(url, post_params, responseHandler, handler_data, errorHandler)
+{
+    var args = {
+        method: "POST",
+        post_data: post_params
+    };
+
+    if (typeof responseHandler !== "undefined") {
+        args.response_handler = responseHandler;
+    }
+
+    if (typeof handler_data !== "undefined")
+        args.handler_data = handler_data;
+
+    if (typeof errorHandler !== "undefined")
+        args.error_handler = errorHandler;
+
+    call_ajax(url, args);
+}
+
+export function call_ajax(url, optional_args)
+{
+    var args = merge_args({
+        add_ajax_id      : true,
+        plain_error      : false,
+        response_handler : null,
+        error_handler    : null,
+        handler_data     : null,
+        method           : "GET",
+        post_data        : null,
+        sync             : false
+    }, optional_args);
+
+    var AJAX = window.XMLHttpRequest ? new window.XMLHttpRequest() : new window.ActiveXObject("Microsoft.XMLHTTP");
+    if (!AJAX)
+        return null;
+
+    // Dynamic part to prevent caching
+    if (args.add_ajax_id) {
+        url += url.indexOf("?") !== -1 ? "&" : "?";
+        url += "_ajaxid="+Math.floor(Date.parse(new Date()) / 1000);
+    }
+
+    if (args.plain_error) {
+        url += url.indexOf("?") !== -1 ? "&" : "?";
+        url += "_plain_error=1";
+    }
+
+    try {
+        AJAX.open(args.method, url, !args.sync);
+    } catch (e) {
+        if (args.error_handler) {
+            args.error_handler(args.handler_data, null, e);
+            return null;
+        } else {
+            throw e;
+        }
+    }
+
+    if (args.method == "POST") {
+        AJAX.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+    }
+
+    if (!args.sync) {
+        AJAX.onreadystatechange = function() {
+            if (AJAX && AJAX.readyState == 4) {
+                if (AJAX.status == 200) {
+                    if (args.response_handler)
+                        args.response_handler(args.handler_data, AJAX.responseText);
+                }
+                else if (AJAX.status == 401) {
+                    // This is reached when someone is not authenticated anymore
+                    // but has some webservices running which are still fetching
+                    // infos via AJAX. Reload the whole frameset or only the
+                    // single page in that case.
+                    if(top)
+                        top.location.reload();
+                    else
+                        document.location.reload();
+                }
+                else {
+                    if (args.error_handler)
+                        args.error_handler(args.handler_data, AJAX.status, AJAX.statusText);
+                }
+            }
+        };
+    }
+
+    AJAX.send(args.post_data);
+    return AJAX;
+}
diff --git a/web/htdocs/js/search.js b/web/htdocs/js/modules/quicksearch.js
similarity index 75%
rename from web/htdocs/js/search.js
rename to web/htdocs/js/modules/quicksearch.js
index a4f77c1f26095..2546464e4bbee 100644
--- a/web/htdocs/js/search.js
+++ b/web/htdocs/js/modules/quicksearch.js
@@ -22,29 +22,28 @@
 // to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
 // Boston, MA 02110-1301 USA.
 
+import { get_url } from "ajax";
+
 var iCurrent = null;
 var oCurrent = null;
 var oldValue = "";
 var g_ajax_obj = null;
 
 // Register an input field to be a search field and add eventhandlers
-function mkSearchAddField(field) {
+export function register_search_field(field) {
     var oField = document.getElementById(field);
     if(oField) {
-        oField.onkeydown = function(e) { if (!e) e = window.event; return mkSearchKeyDown(e, oField); }
-        oField.onkeyup   = function(e) { if (!e) e = window.event; return mkSearchKeyUp(e, oField); }
-        oField.onclick   = function(e) { mkSearchClose(); return true; }
+        oField.onkeydown = function(e) { if (!e) e = window.event; return mkSearchKeyDown(e, oField); };
+        oField.onkeyup   = function(e) { if (!e) e = window.event; return mkSearchKeyUp(e, oField); };
+        oField.onclick   = function() { close_popup(); return true; };
 
         // On doubleclick toggle the list
-        oField.ondblclick  = function(e) { mkSearchToggle(oField); }
+        oField.ondblclick  = function() { toggle_popup(oField); };
     }
 }
 
-mkSearchAddField("mk_side_search_field");
-
 // On key release event handler
 function mkSearchKeyUp(e, oField) {
-
     var keyCode = e.which || e.keyCode;
 
     switch (keyCode) {
@@ -52,35 +51,35 @@ function mkSearchKeyUp(e, oField) {
         // 27: Escape
         case 13:
         case 27:
-            mkSearchClose();
+            close_popup();
             e.returnValue = false;
             e.cancelBubble = true;
-        break;
+            break;
 
         // Other keys
         default:
             if (oField.value == "") {
                 e.returnValue = false;
                 e.cancelBubble = true;
-                mkSearchClose();
+                close_popup();
             }
             else {
                 mkSearch(oField);
             }
-        break;
+            break;
     }
 }
 
 // On key press down event handler
-function mkSearchButton() {
+export function on_search_click() {
     var oField = document.getElementById("mk_side_search_field");
-    var ev = { "which" : 0, "keyCode" : 13 }
+    var ev = { "which" : 0, "keyCode" : 13 };
     return mkSearchKeyDown(ev, oField);
 }
 
 function search_dropdown_value() {
     if (oCurrent)
-        return oCurrent.id.replace('result_', '');
+        return oCurrent.id.replace("result_", "");
     else
         return null;
 }
@@ -93,35 +92,34 @@ function mkSearchKeyDown(e, oField) {
         case 13:
             if (oCurrent != null) {
                 mkSearchNavigate();
-	        oField.value = search_dropdown_value()
-                mkSearchClose();
+                oField.value = search_dropdown_value();
+                close_popup();
             } else {
                 if (oField.value == "")
                     return; /* search field empty, rather not show all services! */
                 // When nothing selected, navigate with the current contents of the field
-                top.frames['main'].location.href = 'search_open.py?q=' + encodeURIComponent(oField.value);
+                top.frames["main"].location.href = "search_open.py?q=" + encodeURIComponent(oField.value);
                 mkTermSearch();
-                mkSearchClose();
+                close_popup();
             }
 
             e.returnValue = false;
             e.cancelBubble = true;
-        break;
+            break;
 
         // Escape
         case 27:
-            mkSearchClose();
+            close_popup();
             e.returnValue = false;
             e.cancelBubble = true;
-        break;
+            break;
 
         // Tab
         case 9:
             if(mkSearchResultShown()) {
-                mkSearchClose();
+                close_popup();
             }
             return;
-        break;
 
         // Up/Down arrow (Must not be handled in onkeyup since this does not fire repeated events)
         case 38:
@@ -134,14 +132,13 @@ function mkSearchKeyDown(e, oField) {
 
             e.preventDefault();
             return false;
-        break;
     }
     oldValue = oField.value;
 }
 
 // Navigate to the target of the selected event
 function mkSearchNavigate() {
-    top.frames['main'].location.href = oCurrent.href;
+    top.frames["main"].location.href = oCurrent.href;
 }
 
 // Move one step of given size in the result list
@@ -152,7 +149,7 @@ function mkSearchMoveElement(step) {
 
     iCurrent += step;
 
-    var oResults = document.getElementById('mk_search_results');
+    var oResults = document.getElementById("mk_search_results");
     if (!oResults)
         return;
 
@@ -166,12 +163,12 @@ function mkSearchMoveElement(step) {
 
     var a = 0;
     for(var i = 0; i < oResults.length; i++) {
-        if(oResults[i].tagName == 'A') {
+        if(oResults[i].tagName == "A") {
             if(a == iCurrent) {
                 oCurrent = oResults[i];
-                oResults[i].setAttribute('class', 'active');
+                oResults[i].setAttribute("class", "active");
             } else {
-                oResults[i].setAttribute('class', 'inactive');
+                oResults[i].setAttribute("class", "inactive");
             }
             a++;
         }
@@ -180,21 +177,21 @@ function mkSearchMoveElement(step) {
 
 // Is the result list shown at the moment?
 function mkSearchResultShown() {
-    return document.getElementById('mk_search_results') ? true : false;
+    return document.getElementById("mk_search_results") ? true : false;
 }
 
 // Toggle the result list
-function mkSearchToggle(oField) {
+function toggle_popup(oField) {
     if(mkSearchResultShown()) {
-        mkSearchClose();
+        close_popup();
     } else {
         mkSearch(oField);
     }
 }
 
 // Close the result list
-function mkSearchClose() {
-    var oContainer = document.getElementById('mk_search_results');
+export function close_popup() {
+    var oContainer = document.getElementById("mk_search_results");
     if(oContainer) {
         oContainer.parentNode.removeChild(oContainer);
     }
@@ -204,17 +201,17 @@ function mkSearchClose() {
 }
 
 function handle_search_response(oField, code) {
-    if (code != '') {
-        var oContainer = document.getElementById('mk_search_results');
+    if (code != "") {
+        var oContainer = document.getElementById("mk_search_results");
         if(!oContainer) {
-            var oContainer = document.createElement('div');
-            oContainer.setAttribute('id', 'mk_search_results');
+            oContainer = document.createElement("div");
+            oContainer.setAttribute("id", "mk_search_results");
             oField.parentNode.appendChild(oContainer);
         }
 
         oContainer.innerHTML = code;
     } else {
-        mkSearchClose();
+        close_popup();
     }
 }
 
@@ -237,6 +234,5 @@ function mkSearch(oField) {
     oldValue = val;
 
     mkTermSearch();
-    g_ajax_obj = get_url('ajax_search.py?q=' + encodeURIComponent(val),
-            handle_search_response, oField);
+    g_ajax_obj = get_url("ajax_search.py?q=" + encodeURIComponent(val), handle_search_response, oField);
 }
diff --git a/web/htdocs/js/modules/utils.js b/web/htdocs/js/modules/utils.js
new file mode 100644
index 0000000000000..c6080bb8d0ec9
--- /dev/null
+++ b/web/htdocs/js/modules/utils.js
@@ -0,0 +1,46 @@
+// +------------------------------------------------------------------+
+// |             ____ _               _        __  __ _  __           |
+// |            / ___| |__   ___  ___| | __   |  \/  | |/ /           |
+// |           | |   | '_ \ / _ \/ __| |/ /   | |\/| | ' /            |
+// |           | |___| | | |  __/ (__|   <    | |  | | . \            |
+// |            \____|_| |_|\___|\___|_|\_\___|_|  |_|_|\_\           |
+// |                                                                  |
+// | Copyright Mathias Kettner 2014             mk@mathias-kettner.de |
+// +------------------------------------------------------------------+
+//
+// This file is part of Check_MK.
+// The official homepage is at http://mathias-kettner.de/check_mk.
+//
+// check_mk is free software;  you can redistribute it and/or modify it
+// under the  terms of the  GNU General Public License  as published by
+// the Free Software Foundation in version 2.  check_mk is  distributed
+// in the hope that it will be useful, but WITHOUT ANY WARRANTY;  with-
+// out even the implied warranty of  MERCHANTABILITY  or  FITNESS FOR A
+// PARTICULAR PURPOSE. See the  GNU General Public License for more de-
+// ails.  You should have  received  a copy of the  GNU  General Public
+// License along with GNU Make; see the file  COPYING.  If  not,  write
+// to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
+// Boston, MA 02110-1301 USA.
+
+// simple implementation of function default arguments when
+// using objects as function parameters. Example:
+// function xxx(args) {
+//     args = merge_args({
+//         'arg2': 'default_val',
+//     });
+// }
+// xxx({
+//   'arg1': 'val1',
+//   'arg3': 'val3',
+// })
+export function merge_args()
+{
+    var defaults = arguments[0];
+    var args = arguments[1] || {};
+
+    for (var name in args)
+        defaults[name] = args[name];
+
+    return defaults;
+}
+
diff --git a/web/htdocs/js/side_index.js b/web/htdocs/js/side_index.js
new file mode 100644
index 0000000000000..e803dcec88c81
--- /dev/null
+++ b/web/htdocs/js/side_index.js
@@ -0,0 +1,40 @@
+
+// +------------------------------------------------------------------+
+// |             ____ _               _        __  __ _  __           |
+// |            / ___| |__   ___  ___| | __   |  \/  | |/ /           |
+// |           | |   | '_ \ / _ \/ __| |/ /   | |\/| | ' /            |
+// |           | |___| | | |  __/ (__|   <    | |  | | . \            |
+// |            \____|_| |_|\___|\___|_|\_\___|_|  |_|_|\_\           |
+// |                                                                  |
+// | Copyright Mathias Kettner 2014             mk@mathias-kettner.de |
+// +------------------------------------------------------------------+
+//
+// This file is part of Check_MK.
+// The official homepage is at http://mathias-kettner.de/check_mk.
+//
+// check_mk is free software;  you can redistribute it and/or modify it
+// under the  terms of the  GNU General Public License  as published by
+// the Free Software Foundation in version 2.  check_mk is  distributed
+// in the hope that it will be useful, but WITHOUT ANY WARRANTY;  with-
+// out even the implied warranty of  MERCHANTABILITY  or  FITNESS FOR A
+// PARTICULAR PURPOSE. See the  GNU General Public License for more de-
+// ails.  You should have  received  a copy of the  GNU  General Public
+// License along with GNU Make; see the file  COPYING.  If  not,  write
+// to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
+// Boston, MA 02110-1301 USA.
+
+import * as ajax from "ajax";
+import * as quicksearch from "quicksearch";
+
+require("script-loader!./checkmk.js");
+require("script-loader!./sidebar.js");
+
+export default {
+    get_url: ajax.get_url,
+    post_url: ajax.post_url,
+    call_ajax: ajax.call_ajax,
+    cmk: {
+        ajax: ajax,
+        quicksearch: quicksearch
+    }
+};
diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js
index 4d03f28afec5e..de1a740532cfa 100644
--- a/web/htdocs/js/sidebar.js
+++ b/web/htdocs/js/sidebar.js
@@ -88,8 +88,8 @@ function registerEdgeListeners(obj) {
 }
 
 function on_mouse_leave(e) {
-    if (typeof(mkSearchClose) != "undefined")
-        mkSearchClose();
+    if (typeof(cmk.quicksearch.close_popup) != "undefined")
+        cmk.quicksearch.close_popup();
     return stop_snapin_dragging(e);
 }
 
@@ -586,13 +586,13 @@ function scrollWheel(event){
 //
 
 // The refresh snapins do reload after a defined amount of time
-refresh_snapins = null;
+var refresh_snapins = null;
 // The restart snapins are notified about the restart of the nagios instance(s)
-restart_snapins = null;
+var restart_snapins = null;
 // Contains a timestamp which holds the time of the last nagios restart handling
-sidebar_restart_time = null;
+var sidebar_restart_time = null;
 // Configures the number of seconds to reload all snapins which request it
-sidebar_update_interval = null;
+var sidebar_update_interval = null;
 
 // Removes the snapin from the current sidebar and informs the server for persistance
 function remove_sidebar_snapin(oLink, url)
@@ -800,8 +800,8 @@ function storeScrollPos() {
  *************************************************/
 
 // FIXME: Make this somehow configurable - use the start url?
-g_last_view   = 'dashboard.py?name=main';
-g_last_folder = '';
+var g_last_view   = 'dashboard.py?name=main';
+var g_last_folder = '';
 
 // highlight the followed link (when both needed snapins are available)
 function highlight_link(link_obj, container_id) {
diff --git a/webpack.config.js b/webpack.config.js
index fc57b52e9ef8f..1cc4f9b184d08 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,7 +4,8 @@ module.exports = {
     mode: "production",
     entry: {
         main: "./web/htdocs/js/index.js",
-        mobile: "./web/htdocs/js/mobile.js"
+        mobile: "./web/htdocs/js/mobile.js",
+        side: "./web/htdocs/js/side_index.js"
     },
     output: {
         path: path.resolve(__dirname, "web/htdocs/js"),
@@ -14,6 +15,7 @@ module.exports = {
         // from HTML code to work with the modules. Until then we need to keep the old behaviour of loading
         // all JS code in the global namespace
         libraryTarget: "window",
+        libraryExport: "default"
     },
     resolve: {
         modules: [
