Adds missing filter functionality to count()
Merge branch 'dev'