Adding a counter for the filter values.
Merge branch 'master' into dev