Even more filter map reduce

Addresses issues raised in #88