Fixing some bugs in URL