[Fixes #1341] CollectionView context is now its content

This should address that, I was really surprised by how simple this was. It is possible I am missing something... Sanity check me?