URI: Implement key-value pair parsing for query

I would only break here to not skip any code afterwards which might be there in the future.