fixing collection filtering