Make Country Handling a litte bite nicer ;)