URI: Implement key-value pair parsing for query

so:
```
if( nextPair == 0 )
{
    query = query.substr( 1 );
    continue;
}
```
?