Modify itemlist assertion and implement save after clearing