[2.0] Fix URL format for appending a query string