fix for query param formatting
Need to escape query params as well.