Building query dynamically
All queries now returning json
Merge branch 'sr-api-explorer' into stage