added custom escaping, since url.EscapeQuery was not using correct encoding