Minor consistency updates
Query update
Merge pull request #136 from Coenego/minor-update

Minor consistency updates