Merging counting queries from branch 'dummy'