more list handling changes for data sync