diff --git a/dist/autoloader.js b/dist/autoloader.js
index efd21ad..a550054 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Tue Dec 04 2018 20:52:11 GMT+0100 (CET)*/
+/*Generated on:Tue Dec 04 2018 23:54:57 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 715a9e0..80553c0 100644
--- a/dist/autoloaderV2.js
+++ b/dist/autoloaderV2.js
@@ -1,4 +1,4 @@
-/*Generated on:Tue Dec 04 2018 20:52:11 GMT+0100 (CET)*/
+/*Generated on:Tue Dec 04 2018 23:54:57 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -19103,49 +19103,49 @@ class AutomaticDispose {
                 self._ADisVehiclesNeed["56"] = 1;
             }
 
-            //if (self.MissionConfig.emergency_medical_service.use_RTW == true){
-            //    self._ADisVehiclesNeed["28"]++;
-            //}
-            //
-            //if (self.MissionConfig.emergency_medical_service.use_NEF == true) {
-            //    self._ADisVehiclesNeed["29"]++;
-            //}
-            //
-            //if (self.MissionConfig.emergency_medical_service.use_RTH == true){
-            //    self._ADisVehiclesNeed["31"]++;
-            //}
-
-            //$.each(Patients, function (Key, Patient) {
-            for (var Key in self.Patients) {
-                var Patient = self.Patients[Key];
-                if (self.MissionConfig.emergency_medical_service.use_KTW == true) {
-                    if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) {
-                        self._ADisVehiclesNeed["38"]++;
-                    }
-                }
-
-                if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) {
-                    self._ADisVehiclesNeed["55"]++;
-                }
-
-                if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) {
-                    self._ADisVehiclesNeed["56"]++;
-                }
-                if (Patient.need_Tragehilfe == true) {
-                    self._ADisVehiclesNeed["0"]++;
-                }
-                if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) {
+            if (Object.keys(self.Patients).length == 0) {
+                if (self.MissionConfig.emergency_medical_service.use_RTW == true) {
                     self._ADisVehiclesNeed["28"]++;
                 }
-                if (self.MissionConfig.emergency_medical_service.use_NEF == true || Patient.need_NEF == true) {
+
+                if (self.MissionConfig.emergency_medical_service.use_NEF == true) {
                     self._ADisVehiclesNeed["29"]++;
                 }
-                if (self.MissionConfig.emergency_medical_service.use_RTH == true || Patient.need_RTH == true) {
+
+                if (self.MissionConfig.emergency_medical_service.use_RTH == true) {
                     self._ADisVehiclesNeed["31"]++;
                 }
-            };
+            } else {
+                for (var Key in self.Patients) {
+                    var Patient = self.Patients[Key];
+                    if (self.MissionConfig.emergency_medical_service.use_KTW == true) {
+                        if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) {
+                            self._ADisVehiclesNeed["38"]++;
+                        }
+                    }
 
+                    if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) {
+                        self._ADisVehiclesNeed["55"]++;
+                    }
 
+                    if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) {
+                        self._ADisVehiclesNeed["56"]++;
+                    }
+                    if (Patient.need_Tragehilfe == true) {
+                        self._ADisVehiclesNeed["0"]++;
+                    }
+                    if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) {
+                        self._ADisVehiclesNeed["28"]++;
+                    }
+                    if (self.MissionConfig.emergency_medical_service.use_NEF == true || Patient.need_NEF == true) {
+                        self._ADisVehiclesNeed["29"]++;
+                    }
+                    if (self.MissionConfig.emergency_medical_service.use_RTH == true || Patient.need_RTH == true) {
+                        self._ADisVehiclesNeed["31"]++;
+                    }
+                };
+
+            }
 
             // TODO: need to be refactored to make sure first KTW Typ B before RTW.
             if (self.MissionConfig.emergency_medical_service.use_SEG_ELW1_Only == "true") {
diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js
index c0e586f..26efbb4 100644
--- a/src/autoloaderV2.js
+++ b/src/autoloaderV2.js
@@ -1511,49 +1511,49 @@ class AutomaticDispose {
                 self._ADisVehiclesNeed["56"] = 1;
             }
 
-            //if (self.MissionConfig.emergency_medical_service.use_RTW == true){
-            //    self._ADisVehiclesNeed["28"]++;
-            //}
-            //
-            //if (self.MissionConfig.emergency_medical_service.use_NEF == true) {
-            //    self._ADisVehiclesNeed["29"]++;
-            //}
-            //
-            //if (self.MissionConfig.emergency_medical_service.use_RTH == true){
-            //    self._ADisVehiclesNeed["31"]++;
-            //}
-
-            //$.each(Patients, function (Key, Patient) {
-            for (var Key in self.Patients) {
-                var Patient = self.Patients[Key];
-                if (self.MissionConfig.emergency_medical_service.use_KTW == true) {
-                    if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) {
-                        self._ADisVehiclesNeed["38"]++;
-                    }
-                }
-
-                if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) {
-                    self._ADisVehiclesNeed["55"]++;
-                }
-
-                if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) {
-                    self._ADisVehiclesNeed["56"]++;
-                }
-                if (Patient.need_Tragehilfe == true) {
-                    self._ADisVehiclesNeed["0"]++;
-                }
-                if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) {
+            if (Object.keys(self.Patients).length == 0) {
+                if (self.MissionConfig.emergency_medical_service.use_RTW == true) {
                     self._ADisVehiclesNeed["28"]++;
                 }
-                if (self.MissionConfig.emergency_medical_service.use_NEF == true || Patient.need_NEF == true) {
+
+                if (self.MissionConfig.emergency_medical_service.use_NEF == true) {
                     self._ADisVehiclesNeed["29"]++;
                 }
-                if (self.MissionConfig.emergency_medical_service.use_RTH == true || Patient.need_RTH == true) {
+
+                if (self.MissionConfig.emergency_medical_service.use_RTH == true) {
                     self._ADisVehiclesNeed["31"]++;
                 }
-            };
+            } else {
+                for (var Key in self.Patients) {
+                    var Patient = self.Patients[Key];
+                    if (self.MissionConfig.emergency_medical_service.use_KTW == true) {
+                        if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) {
+                            self._ADisVehiclesNeed["38"]++;
+                        }
+                    }
 
+                    if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) {
+                        self._ADisVehiclesNeed["55"]++;
+                    }
 
+                    if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) {
+                        self._ADisVehiclesNeed["56"]++;
+                    }
+                    if (Patient.need_Tragehilfe == true) {
+                        self._ADisVehiclesNeed["0"]++;
+                    }
+                    if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) {
+                        self._ADisVehiclesNeed["28"]++;
+                    }
+                    if (self.MissionConfig.emergency_medical_service.use_NEF == true || Patient.need_NEF == true) {
+                        self._ADisVehiclesNeed["29"]++;
+                    }
+                    if (self.MissionConfig.emergency_medical_service.use_RTH == true || Patient.need_RTH == true) {
+                        self._ADisVehiclesNeed["31"]++;
+                    }
+                };
+
+            }
 
             // TODO: need to be refactored to make sure first KTW Typ B before RTW.
             if (self.MissionConfig.emergency_medical_service.use_SEG_ELW1_Only == "true") {