XUri: replaced original with new XUriParser implementation