Make language override URLs more robust