diff --git a/Moose Development/Moose/Ops/Awacs.lua b/Moose Development/Moose/Ops/Awacs.lua
index 3c04848a3..d4e58c12c 100644
--- a/Moose Development/Moose/Ops/Awacs.lua	
+++ b/Moose Development/Moose/Ops/Awacs.lua	
@@ -1517,6 +1517,23 @@ function AWACS:_SubScribeTactRadio(Group,Frequency)
   return self
 end
 
+--- [Internal] _CheckSubscribers
+-- @param #AWACS self
+-- @return #AWACS self
+function AWACS:_CheckSubscribers()
+   self:T(self.lid.."_InitLocalization")
+   
+   for _name,_freq in pairs(self.TacticalSubscribers or {}) do
+    local grp = GROUP:FindByName(_name)
+    if (not grp) or (not grp:IsAlive()) then
+      self.TacticalFrequencies[_freq] = _freq
+      self.TacticalSubscribers[_name] = nil
+    end
+   end
+   
+   return self
+end
+
 --- [Internal] Init localization
 -- @param #AWACS self
 -- @return #AWACS self
@@ -6180,6 +6197,8 @@ function AWACS:onafterStatus(From, Event, To)
     
     self:_CheckMerges()
     
+    self:_CheckSubscribers()
+    
     local outcome, targets = self:_TargetSelectionProcess(true)
     
     self:_CheckTaskQueue()
diff --git a/Moose Development/Moose/Ops/PlayerTask.lua b/Moose Development/Moose/Ops/PlayerTask.lua
index d44e9c644..b589bdd63 100644
--- a/Moose Development/Moose/Ops/PlayerTask.lua	
+++ b/Moose Development/Moose/Ops/PlayerTask.lua	
@@ -98,7 +98,7 @@ PLAYERTASK = {
   
 --- PLAYERTASK class version.
 -- @field #string version
-PLAYERTASK.version="0.1.18"
+PLAYERTASK.version="0.1.19"
 
 --- Generic task condition.
 -- @type PLAYERTASK.Condition
@@ -2483,6 +2483,15 @@ function PLAYERTASKCONTROLLER:_CheckTaskQueue()
         self:T("*****Removing player " .. _id)
         self.TasksPerPlayer:PullByID(_id)
       end
+      local clients=task:GetClientObjects()
+      for _,client in pairs(clients) do
+        self:_RemoveMenuEntriesForTask(task,client)
+        --self:_SwitchMenuForClient(client,"Info")
+      end
+      for _,client in pairs(clients) do
+       -- self:_RemoveMenuEntriesForTask(Task,client)
+        self:_SwitchMenuForClient(client,"Info",5)
+      end
       -- Follow-up tasks?
       local nexttasks = {}
       if task.FinalState == "Success" then
@@ -3594,28 +3603,28 @@ function PLAYERTASKCONTROLLER:_RemoveMenuEntriesForTask(Task,Client)
   if Task then
     if Task.UUIDS and self.JoinTaskMenuTemplate then
       --self:I("***** JoinTaskMenuTemplate")
-      UTILS.PrintTableToLog(Task.UUIDS)
+      --UTILS.PrintTableToLog(Task.UUIDS)
       local controller = self.JoinTaskMenuTemplate
       for _,_uuid in pairs(Task.UUIDS) do
         local Entry = controller:FindEntryByUUID(_uuid)
         if Entry then
           controller:DeleteF10Entry(Entry,Client)
           controller:DeleteGenericEntry(Entry)
-          UTILS.PrintTableToLog(controller.menutree)
+          --UTILS.PrintTableToLog(controller.menutree)
         end
       end
     end
 
     if Task.AUUIDS and self.ActiveTaskMenuTemplate then
       --self:I("***** ActiveTaskMenuTemplate")
-      UTILS.PrintTableToLog(Task.AUUIDS)
+      --UTILS.PrintTableToLog(Task.AUUIDS)
       for _,_uuid in pairs(Task.AUUIDS) do
         local controller = self.ActiveTaskMenuTemplate
         local Entry = controller:FindEntryByUUID(_uuid)
         if Entry then
           controller:DeleteF10Entry(Entry,Client)
           controller:DeleteGenericEntry(Entry)
-          UTILS.PrintTableToLog(controller.menutree)
+          --UTILS.PrintTableToLog(controller.menutree)
         end
       end
     end
@@ -4210,6 +4219,15 @@ function PLAYERTASKCONTROLLER:onafterTaskFailed(From, Event, To, Task)
     taskname = string.format(failtxttts, self.MenuName or self.Name, Task.PlayerTaskNr, tostring(Task.TTSType))
     self.SRSQueue:NewTransmission(taskname,nil,self.SRS,nil,2)
   end
+  local clients=Task:GetClientObjects()
+  for _,client in pairs(clients) do
+    self:_RemoveMenuEntriesForTask(Task,client)
+    --self:_SwitchMenuForClient(client,"Info")
+  end
+  for _,client in pairs(clients) do
+   -- self:_RemoveMenuEntriesForTask(Task,client)
+    self:_SwitchMenuForClient(client,"Info",5)
+  end
   return self
 end