Improved the query command a bit - it should be less confusing when the
user makes an error (it's now a bit more restrictive, but also explains
better when things go wrong).
Merge pull request #244 from EricWittmann/sramp-185-query-command

(sramp-185) Query command improvement (CLI)