Get rid of raw and escaped URL problems right at the source