filtering by type updated #61