FilteredList Fixes for CollectionViewDataSource.