Added support for URI query parts