Fixed the issues related to URLs