Add filtering of properties according to issue #75