Added filter support for collection type