Commons collections fixes
Submitting feedback - doesn't quite work yet