diff --git a/dist/autoloader.js b/dist/autoloader.js
index 7bf17b2..082b4d9 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Mon Dec 17 2018 13:26:07 GMT+0100 (CET)*/
+/*Generated on:Mon Dec 17 2018 15:21:41 GMT+0100 (CET)*/
 var AutomaticDispose_Branch = "master";
 var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
 var da_lss_adis_time = new Date().getTime();
diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js
index 143ef92..ecac666 100644
--- a/dist/autoloaderV2.js
+++ b/dist/autoloaderV2.js
@@ -1,4 +1,4 @@
-/*Generated on:Mon Dec 17 2018 13:26:07 GMT+0100 (CET)*/
+/*Generated on:Mon Dec 17 2018 15:21:41 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -18573,67 +18573,94 @@ class AutomaticDispose {
                 return self.ADisDB.ADisMissions.where(where).limit(1)
             }
         }).then((Missions) => {
-            if (typeof Missions === "undefined") {
-                return;
-            }
-            return Missions.count((count) => {
-                if (count > 0) {
-                    return Missions.each((MyMission) => {
+            if (typeof Missions !== "undefined") {
+
+                return Missions.count((count) => {
+                    if (count > 0) {
+                        return Missions.each((MyMission) => {
+                            var MissionElement = $("#mission_" + ID);
+                            var _MissionID = MissionElement.attr("mission_id");
+                            var _MissionType = MissionElement.attr("mission_type_id");
+                            var addr = MissionElement.find(".map_position_mover").text().split(",")
+                            var MissionName = addr[0];
+                            var MissionStreet = addr[1];
+                            var MissionVillage = addr[2];
+
+                            return self.ADisDB.ADisAvailabelMissions.get({
+                                type: _MissionType
+                            }).then((available) => {
+                                return self.AddMissionsToQueue({
+                                    "id": _MissionID,
+                                    "type": _MissionType,
+                                    "runner": MyMission.runner,
+                                    "name": MissionName,
+                                    "street": MissionStreet,
+                                    "village": MissionVillage,
+                                    "available": MyMission.available,
+                                    "done": MyMission.done,
+                                    "last_check": MyMission.last_check,
+                                    "next_check": MyMission.next_check
+                                });
+
+                            });
+
+                        });
+                    } else {
                         var MissionElement = $("#mission_" + ID);
-                        var _MissionID = MissionElement.attr("mission_id");
-                        var _MissionType = MissionElement.attr("mission_type_id");
+
+                        var MissionID = MissionElement.attr("mission_id");
+                        var MissionType = MissionElement.attr("mission_type_id");
                         var addr = MissionElement.find(".map_position_mover").text().split(",")
                         var MissionName = addr[0];
                         var MissionStreet = addr[1];
                         var MissionVillage = addr[2];
 
                         return self.ADisDB.ADisAvailabelMissions.get({
-                            type: _MissionType
+                            type: MissionType
                         }).then((available) => {
                             return self.AddMissionsToQueue({
-                                "id": _MissionID,
-                                "type": _MissionType,
-                                "runner": MyMission.runner,
+                                "id": MissionID,
+                                "type": MissionType,
+                                "runner": runnerOpt,
                                 "name": MissionName,
                                 "street": MissionStreet,
                                 "village": MissionVillage,
-                                "available": MyMission.available,
-                                "done": MyMission.done,
-                                "last_check": MyMission.last_check,
-                                "next_check": MyMission.next_check
+                                "available": (available !== undefined),
+                                "done": false,
+                                "last_check": Math.floor(new Date().getTime() / 1000),
+                                "next_check": Math.floor(new Date().getTime() / 1000) + 1
                             });
-                            
                         });
+                    }
+                });
 
+            } else {
+                var MissionElement = $("#mission_" + ID);
+
+                var MissionID = MissionElement.attr("mission_id");
+                var MissionType = MissionElement.attr("mission_type_id");
+                var addr = MissionElement.find(".map_position_mover").text().split(",")
+                var MissionName = addr[0];
+                var MissionStreet = addr[1];
+                var MissionVillage = addr[2];
+
+                return self.ADisDB.ADisAvailabelMissions.get({
+                    type: MissionType
+                }).then((available) => {
+                    return self.AddMissionsToQueue({
+                        "id": MissionID,
+                        "type": MissionType,
+                        "runner": runnerOpt,
+                        "name": MissionName,
+                        "street": MissionStreet,
+                        "village": MissionVillage,
+                        "available": (available !== undefined),
+                        "done": false,
+                        "last_check": Math.floor(new Date().getTime() / 1000),
+                        "next_check": Math.floor(new Date().getTime() / 1000) + 1
                     });
-                } else {
-                    var MissionElement = $("#mission_" + ID);
-
-                    var MissionID = MissionElement.attr("mission_id");
-                    var MissionType = MissionElement.attr("mission_type_id");
-                    var addr = MissionElement.find(".map_position_mover").text().split(",")
-                    var MissionName = addr[0];
-                    var MissionStreet = addr[1];
-                    var MissionVillage = addr[2];
-
-                    return self.ADisDB.ADisAvailabelMissions.get({
-                        type: MissionType
-                    }).then((available) => {
-                        return self.AddMissionsToQueue({
-                            "id": MissionID,
-                            "type": MissionType,
-                            "runner": runnerOpt,
-                            "name": MissionName,
-                            "street": MissionStreet,
-                            "village": MissionVillage,
-                            "available": (available !== undefined),
-                            "done": false,
-                            "last_check": Math.floor(new Date().getTime() / 1000),
-                            "next_check": Math.floor(new Date().getTime() / 1000) + 1
-                        });
-                    });
-                }
-            });
+                });
+            }
         });
     }
 
@@ -18664,7 +18691,7 @@ class AutomaticDispose {
     }
 
     FreeIframe(Runner) {
-        console.log('FreeIframe',Runner);
+        console.log('FreeIframe', Runner);
         const self = this;
         const runnerID = self.ADisSettings.runner.indexOf(Runner)
         const runnerIframe = self.ADisSettings.runner_iframes[runnerID];
diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js
index 0c92b74..d226681 100644
--- a/src/autoloaderV2.js
+++ b/src/autoloaderV2.js
@@ -913,67 +913,94 @@ class AutomaticDispose {
                 return self.ADisDB.ADisMissions.where(where).limit(1)
             }
         }).then((Missions) => {
-            if (typeof Missions === "undefined") {
-                return;
-            }
-            return Missions.count((count) => {
-                if (count > 0) {
-                    return Missions.each((MyMission) => {
+            if (typeof Missions !== "undefined") {
+
+                return Missions.count((count) => {
+                    if (count > 0) {
+                        return Missions.each((MyMission) => {
+                            var MissionElement = $("#mission_" + ID);
+                            var _MissionID = MissionElement.attr("mission_id");
+                            var _MissionType = MissionElement.attr("mission_type_id");
+                            var addr = MissionElement.find(".map_position_mover").text().split(",")
+                            var MissionName = addr[0];
+                            var MissionStreet = addr[1];
+                            var MissionVillage = addr[2];
+
+                            return self.ADisDB.ADisAvailabelMissions.get({
+                                type: _MissionType
+                            }).then((available) => {
+                                return self.AddMissionsToQueue({
+                                    "id": _MissionID,
+                                    "type": _MissionType,
+                                    "runner": MyMission.runner,
+                                    "name": MissionName,
+                                    "street": MissionStreet,
+                                    "village": MissionVillage,
+                                    "available": MyMission.available,
+                                    "done": MyMission.done,
+                                    "last_check": MyMission.last_check,
+                                    "next_check": MyMission.next_check
+                                });
+
+                            });
+
+                        });
+                    } else {
                         var MissionElement = $("#mission_" + ID);
-                        var _MissionID = MissionElement.attr("mission_id");
-                        var _MissionType = MissionElement.attr("mission_type_id");
+
+                        var MissionID = MissionElement.attr("mission_id");
+                        var MissionType = MissionElement.attr("mission_type_id");
                         var addr = MissionElement.find(".map_position_mover").text().split(",")
                         var MissionName = addr[0];
                         var MissionStreet = addr[1];
                         var MissionVillage = addr[2];
 
                         return self.ADisDB.ADisAvailabelMissions.get({
-                            type: _MissionType
+                            type: MissionType
                         }).then((available) => {
                             return self.AddMissionsToQueue({
-                                "id": _MissionID,
-                                "type": _MissionType,
-                                "runner": MyMission.runner,
+                                "id": MissionID,
+                                "type": MissionType,
+                                "runner": runnerOpt,
                                 "name": MissionName,
                                 "street": MissionStreet,
                                 "village": MissionVillage,
-                                "available": MyMission.available,
-                                "done": MyMission.done,
-                                "last_check": MyMission.last_check,
-                                "next_check": MyMission.next_check
+                                "available": (available !== undefined),
+                                "done": false,
+                                "last_check": Math.floor(new Date().getTime() / 1000),
+                                "next_check": Math.floor(new Date().getTime() / 1000) + 1
                             });
-                            
                         });
+                    }
+                });
 
+            } else {
+                var MissionElement = $("#mission_" + ID);
+
+                var MissionID = MissionElement.attr("mission_id");
+                var MissionType = MissionElement.attr("mission_type_id");
+                var addr = MissionElement.find(".map_position_mover").text().split(",")
+                var MissionName = addr[0];
+                var MissionStreet = addr[1];
+                var MissionVillage = addr[2];
+
+                return self.ADisDB.ADisAvailabelMissions.get({
+                    type: MissionType
+                }).then((available) => {
+                    return self.AddMissionsToQueue({
+                        "id": MissionID,
+                        "type": MissionType,
+                        "runner": runnerOpt,
+                        "name": MissionName,
+                        "street": MissionStreet,
+                        "village": MissionVillage,
+                        "available": (available !== undefined),
+                        "done": false,
+                        "last_check": Math.floor(new Date().getTime() / 1000),
+                        "next_check": Math.floor(new Date().getTime() / 1000) + 1
                     });
-                } else {
-                    var MissionElement = $("#mission_" + ID);
-
-                    var MissionID = MissionElement.attr("mission_id");
-                    var MissionType = MissionElement.attr("mission_type_id");
-                    var addr = MissionElement.find(".map_position_mover").text().split(",")
-                    var MissionName = addr[0];
-                    var MissionStreet = addr[1];
-                    var MissionVillage = addr[2];
-
-                    return self.ADisDB.ADisAvailabelMissions.get({
-                        type: MissionType
-                    }).then((available) => {
-                        return self.AddMissionsToQueue({
-                            "id": MissionID,
-                            "type": MissionType,
-                            "runner": runnerOpt,
-                            "name": MissionName,
-                            "street": MissionStreet,
-                            "village": MissionVillage,
-                            "available": (available !== undefined),
-                            "done": false,
-                            "last_check": Math.floor(new Date().getTime() / 1000),
-                            "next_check": Math.floor(new Date().getTime() / 1000) + 1
-                        });
-                    });
-                }
-            });
+                });
+            }
         });
     }
 
@@ -1004,7 +1031,7 @@ class AutomaticDispose {
     }
 
     FreeIframe(Runner) {
-        console.log('FreeIframe',Runner);
+        console.log('FreeIframe', Runner);
         const self = this;
         const runnerID = self.ADisSettings.runner.indexOf(Runner)
         const runnerIframe = self.ADisSettings.runner_iframes[runnerID];