fixed url handing