WIP: Total query count should account for filters.

#149

next is adding tests, but it's Friday evening :)