Minor tweaks regarding collection filtering