* Add type safety to query whitelist

* bring back commented out tests

* add godoc

(cherry picked from commit b888f888

)

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>