Improved handle of query parameters and relative versus absolute url’s