Move URL correction to the good place