if (encoding == null)
throw new ArgumentNullException ("encoding");
if (query.Length == 0 || (query.Length == 1 && query[0] == '?'))
- return new NameValueCollection ();
+ return new HttpQSCollection ();
if (query[0] == '?')
query = query.Substring (1);