fixes 2 issues

#71 SW data - country names not ISO codes
#17 Incorrectly configured collection