Corrections and edits to query builder docs
Merge pull request #1340 from bcrowe/3.0-query-builder

3.0 - Corrections and edits to query builder docs