Fixed the url generation