Fixed map issues with filter/map chains

I really broke the last version...