Tasks filter refactor