Fix bug where 'Try it now' window did not open
Use 'with' to set context and remove all the querying
Add API docs for v2