Minor unit test changes
Doc fixups - corrections, missed changes, and minor formatting
Revert "Doc fixups - corrections, missed changes, and minor formatting"

This reverts commit 390aa96c3188d373411fd04d9947010c61d04594.
Doc fixups - corrections, missed changes, and minor formatting
Restrict some fields from being used as query criteria.
Fix bug in prior commit: put query field check in the wrong place.
Unit test fixes