Fix to work with SmartCollection and Collection2
Change update function to use modifiers in order to support restricted collections