Fix listview bugs