Add filter logic for tasks
Add filter logic for tasks