Small fixes for filter counts
Merge pull request #1745 from reciprocity/feature/workflow-filter-fixes

Small fixes for filter counts