cleanup lists and add TextList and DataList