Fix to return task with subtasks after update