Fix the filters that include the tasks. Closes #1