Task Filtering Fix