fix context to be backwards compat
cleanup
fix query forwarding
fix case with no request params
make query id a bit more readable
Merge pull request #464 from metamx/fix-context

Fix context to be backwards compatible with String values