re-working country codes to solve Yugoslavia problem