Fixed map issues with filter/map chains