Added some final touches on updating selection when collection items change.