Fixing task list to allow filter support