Fixed western Saharah, better recovery from incorrect country codes.