Fix DataSets populate and SortOrder Repository