Adding support and indexing for all collection predicates, suppressing carousel images