Fixed some issues related to url