Added filtering in task list