Added support for URLs containing query strings