Setting fix and itemlist fix