diff --git a/dist/autoloader.js b/dist/autoloader.js
index 379317c..5e05429 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Sat Nov 24 2018 15:56:49 GMT+0100 (CET)*/
+/*Generated on:Sat Nov 24 2018 16:01:15 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();
@@ -6351,16 +6351,25 @@ ADisDB.on("ready", () => {
         function ADis_CollectRescueSprechwuensche() {
             ADisDB.ADisSprechwunsch.where({
                 done: 'false'
-            }).each((Wunsch) => {
-                if ($("#vehicle_list_" + Wunsch.vehicleID).find(".building_list_fms").text() != "5") {
-                    return ADis_RemoveRescueSprechwunschFromQueue(Wunsch.vehicleID);
+            }).then((Wunsch) => {
+                if (Wunsch !== undefined) {
+                    return Wunsch.count(function (count) {
+                        if (count > 0) {
+                            return Wunsch.each((myWunsch) => {
+                                if ($("#vehicle_list_" + myWunsch.vehicleID).find(".building_list_fms").text() != "5") {
+                                    return ADis_RemoveRescueSprechwunschFromQueue(myWunsch.vehicleID);
+                                }
+                            })
+        
+                        }
+                    })
                 }
             }).then(() => {
                 $("#building_list").find(".building_list_vehicle_element").each(function () {
                     var VehicleStatus = $(this).find(".building_list_fms").text();
                     var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id")));
                     var VehicleID = $(this).attr("vehicle_id");
-                    if (VehicleStatus == "5" && [32,52].indexOf(VehicleType) === -1) {
+                    if (VehicleStatus == "5" && [32, 52].indexOf(VehicleType) === -1) {
                         ADis_AddRescueSprechwunschToQueue(VehicleID);
                     }
                 });
@@ -6427,10 +6436,18 @@ ADisDB.on("ready", () => {
         function ADis_CollectPoliceSprechwuensche() {
             ADisDB.ADisSprechwunschPolice.where({
                 done: 'false'
-            }).each((Wunsch) => {
-                if (!$("#mission_" + Wunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) {
-                    $("#mission_" + Wunsch.missionID).remove();
-                    return ADis_RemovePoliceSprechwunschFromQueue(Wunsch.missionID);
+            }).then((Wunsch) => {
+                if (Wunsch !== undefined) {
+                    return Wunsch.count(function (count) {
+                        if (count > 0) {
+                            return Wunsch.each((myWunsch) => {
+                                if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) {
+                                    $("#mission_" + myWunsch.missionID).remove();
+                                    return ADis_RemovePoliceSprechwunschFromQueue(myWunsch.missionID);
+                                }
+                            });
+                        }
+                    })
                 }
             }).then(() => {
                 var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');
diff --git a/dist/standalone.js b/dist/standalone.js
index abec82b..b873142 100644
--- a/dist/standalone.js
+++ b/dist/standalone.js
@@ -1,4 +1,4 @@
-/*Generated on:Sat Nov 24 2018 15:56:49 GMT+0100 (CET)*/
+/*Generated on:Sat Nov 24 2018 16:01:15 GMT+0100 (CET)*/
 function includesString(string1, string2) {
     return string1.toLowerCase().includes(string2.toLowerCase());
 }
diff --git a/script/sprechwunsch/police-opener.js b/script/sprechwunsch/police-opener.js
index 8b4d385..94038e8 100755
--- a/script/sprechwunsch/police-opener.js
+++ b/script/sprechwunsch/police-opener.js
@@ -15,10 +15,18 @@ $(document).ready(function () {
 function ADis_CollectPoliceSprechwuensche() {
     ADisDB.ADisSprechwunschPolice.where({
         done: 'false'
-    }).each((Wunsch) => {
-        if (!$("#mission_" + Wunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) {
-            $("#mission_" + Wunsch.missionID).remove();
-            return ADis_RemovePoliceSprechwunschFromQueue(Wunsch.missionID);
+    }).then((Wunsch) => {
+        if (Wunsch !== undefined) {
+            return Wunsch.count(function (count) {
+                if (count > 0) {
+                    return Wunsch.each((myWunsch) => {
+                        if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) {
+                            $("#mission_" + myWunsch.missionID).remove();
+                            return ADis_RemovePoliceSprechwunschFromQueue(myWunsch.missionID);
+                        }
+                    });
+                }
+            })
         }
     }).then(() => {
         var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');
diff --git a/script/sprechwunsch/rescue-opener.js b/script/sprechwunsch/rescue-opener.js
index ee942d1..6387445 100755
--- a/script/sprechwunsch/rescue-opener.js
+++ b/script/sprechwunsch/rescue-opener.js
@@ -13,16 +13,25 @@ $(document).ready(function () {
 function ADis_CollectRescueSprechwuensche() {
     ADisDB.ADisSprechwunsch.where({
         done: 'false'
-    }).each((Wunsch) => {
-        if ($("#vehicle_list_" + Wunsch.vehicleID).find(".building_list_fms").text() != "5") {
-            return ADis_RemoveRescueSprechwunschFromQueue(Wunsch.vehicleID);
+    }).then((Wunsch) => {
+        if (Wunsch !== undefined) {
+            return Wunsch.count(function (count) {
+                if (count > 0) {
+                    return Wunsch.each((myWunsch) => {
+                        if ($("#vehicle_list_" + myWunsch.vehicleID).find(".building_list_fms").text() != "5") {
+                            return ADis_RemoveRescueSprechwunschFromQueue(myWunsch.vehicleID);
+                        }
+                    })
+
+                }
+            })
         }
     }).then(() => {
         $("#building_list").find(".building_list_vehicle_element").each(function () {
             var VehicleStatus = $(this).find(".building_list_fms").text();
             var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id")));
             var VehicleID = $(this).attr("vehicle_id");
-            if (VehicleStatus == "5" && [32,52].indexOf(VehicleType) === -1) {
+            if (VehicleStatus == "5" && [32, 52].indexOf(VehicleType) === -1) {
                 ADis_AddRescueSprechwunschToQueue(VehicleID);
             }
         });