Fixup collection and each view

- [ ] tests
- [ ] remove refinements

(cc @krisselden)