Encode query url
Merge branch 'sr-api-explorer' into stage