Improve query coverage.
Merge pull request #39 from johnmarkos/queryCoverage

Improve query coverage.