Move incremental count into filtered check