fix some crashes, use nation instead of country for now, since country is a special term for simple forms...