working on keys issue in dataset switching