Issue #9 Removed UniqueList and fixed some bugs in ListAdapter