Adding a counter for the filter values.
Add a missing count.
Change a SQL query.
Change the SQL query, again.
Merge branch 'dev'