Bug fixed on tasks and updates