No bug - Refactor the URL creation bits