Fix url resolution with regards to querysting parameters.
Add tests for changes to url resolution with regards to querysting parameters.