Always extract original URL from next_url (#318)