Aravind | #235 | not saving only countries and datasets