Collection Filtering bugs squashed...