Item List bug fixes / duplication fixes