Improve docblocks

Couple of docblock and linting fixes.
Lower-case "query".