diff --git a/main.js b/main.js
index 466af77bc5579b1967fd7c724dfdd233b67cd804..741d245306cfebb38bacf7c3af1fc7c0a510aab5 100644
--- a/main.js
+++ b/main.js
@@ -128,6 +128,7 @@ function createDevToolsWindow() {
 
 function createLogWindow() {
     /* Log window */
+    logger.debug('main', 'Open log view');
     const opt = defaultWindowOptions('Amadeus - Log window');
     opt.parent = win;
     opt.frame = false;
@@ -139,6 +140,7 @@ function createLogWindow() {
 
 function createUserViewWindow() {
     /* User view window */
+    logger.debug('main', 'Open client view');
     const opt = defaultWindowOptions('Amadeus - User view');
     const uv = new BrowserWindow(opt);
     uv.loadURL(`http://localhost:${config.content.client.port}/`);
@@ -147,6 +149,7 @@ function createUserViewWindow() {
 
 function createKurisuWindow() {
     /* Kurisu window */
+    logger.debug('main', 'Open kurisu view');
     const opt = defaultWindowOptions('Amadeus - Kurisu');
     const kurisu = new BrowserWindow(opt);
     kurisu.loadURL(config.content.kurisu.url);
@@ -204,20 +207,9 @@ app.on('ready', () => {
  * Kurisu View *
  ***************/
 
-ipcMain.on('toggle-kurisu', () => {
-    logger.debug('main', 'Open kurisu view');
-    createKurisuWindow();
-});
-
-ipcMain.on('toggle-client-view', () => {
-    logger.debug('main', 'Open client view');
-    createUserViewWindow();
-});
-
-ipcMain.on('toggle-log-view', () => {
-    logger.debug('main', 'Open log view');
-    createLogWindow();
-});
+ipcMain.on('toggle-kurisu', () => createKurisuWindow());
+ipcMain.on('toggle-client-view', () => createUserViewWindow());
+ipcMain.on('toggle-log-view', () => createLogWindow());
 
 /*********************************
  * Messages from the main window *
@@ -226,33 +218,22 @@ ipcMain.on('toggle-log-view', () => {
 var songTimeData = { elapsed: 0, total: 100, state: 'stop', song: '0' };
 var counterTime = 0;
 
-ipcMain.on('cmd-play', (event, arg) => {
-    lkt.commandPlay().then(arg => {
-        logger.debug('main', 'Returned from cmd-play');
-    });
-});
-ipcMain.on('cmd-stop', (event, arg) => {
-    lkt.commandStop().then(arg => {
-        logger.debug('main', 'Returned from cmd-stop');
-    });
-});
-ipcMain.on('cmd-clear', (event, arg) => {
-    lkt.commandClear().then(arg => {
-        logger.debug('main', 'Cleared queue with cmd-clear');
-    });
-});
+ipcMain.on('cmd-play', () => lkt.commandPlay().then(arg => logger.debug('main', 'Returned from cmd-play')));
+ipcMain.on('cmd-stop', () => lkt.commandStop().then(arg => logger.debug('main', 'Returned from cmd-stop')));
+ipcMain.on('cmd-clear', () => lkt.commandClear().then(arg => logger.debug('main', 'Cleared queue with cmd-clear')));
 
 /* Fill the pannel with the content of the DB.
  * The `arg` is the HTML object of the pannel */
 ipcMain.on('reload-db-request', (event, arg) => {
     logger.info('main', 'Reloading the DB content');
-    var callback = karas => {
-        event.reply('reload-db-responce', karas);
-    };
-    if (arg && (arg.search || arg.search == '')) {
+    const callback = karas => event.reply('reload-db-responce', karas);
+    if (arg && arg.search && arg.search !== '') {
         __lastFilter = arg.search;
         logger.debug('main', `Reload DB with search '${arg}'`);
         db.search(__lastFilter, 0, 100).then(callback);
+    } else if ((arg && arg.search === '') || __lastFilter === '') {
+        __lastFilter = '';
+        callback([]);
     } else {
         logger.debug('main', `Reload DB with last filter '${__lastFilter}'`);
         db.search(__lastFilter, 0, 100).then(callback);
@@ -265,21 +246,10 @@ ipcMain.on('queue-moved-kara', (event, movement) => {
     }
 });
 
-ipcMain.on('play-kara-queue-pos', (event, arg) => {
-    lkt.commandPlayPos(arg.position);
-});
-
-ipcMain.on('add-kara-queue-id', (event, arg) => {
-    lkt.commandQueueAddId(arg.id);
-});
-
-ipcMain.on('insert-kara-queue-id', (event, arg) => {
-    lkt.commandQueueInsertId(arg.id);
-});
-
-ipcMain.on('delete-kara-queue-pos', (event, arg) => {
-    lkt.commandQueueDelPos(arg.position);
-});
+ipcMain.on('play-kara-queue-pos', (event, arg) => lkt.commandPlayPos(arg.position));
+ipcMain.on('add-kara-queue-id', (event, arg) => lkt.commandQueueAddId(arg.id));
+ipcMain.on('insert-kara-queue-id', (event, arg) => lkt.commandQueueInsertId(arg.id));
+ipcMain.on('delete-kara-queue-pos', (event, arg) => lkt.commandQueueDelPos(arg.position));
 
 ipcMain.on('add-kara-queue-pos', (event, addparams) => {
     lkt.commandQueueAddId(addparams.id).then(() => lkt.commandMove(addparams.queueSize + 1, addparams.position));