Fixed the url generations.