HCSVLAB-461: Fix ungrouped collections