Fixing URL overflow