#71 changed filtering of properties;