Fixes from testing on the filter collection extension