Some fixes in url