Better/fixed main list refresh