Improved check for count filter argument.
Merge pull request #1995 from radev/next

Improved check for count filter argument.