fixing issue with initial loading and populating of collection and also when returning to list