Add a (failing) unit test for #307
Initial support for Map-filtering, via properties
Implemented #307