minor cleaning
Fixes #506; Wrong filters used for count