Local-Client: bug-prevents + better list updating