Fix map implementation and implement filter methods for object-oriented sets