No bug - Refactor the URL creation bits
Fix bug 906093 - Add support for web xray makes