Simplify Url by removing UrlQuery