Update CollectionView handlers

fixes #1211 and unblocks #1173