CW: Refine listview loading
CW: Added favourite updates