count-bugfix - separated empty queries from joined queries
Merge pull request #175 from kazoompa/count-bugfix

count-bugfix - separated empty queries from joined queries