#94 added support for token auth context as part of query.