More changes to ExportExpandableListAdapter