Added additional filter on tasks