[5.0] Patch collection lists

Rehash of pull request #6009 hopefully more up-to-par this time. :)