fixed some issues with parent data set