fixed some saving issues for expandable list