Fixes from review comments on filtered collection.