CMS::Collection update; more consistent use of active filters, comments and corner-case checks