slight factoring
black-list some false positives from the custom property map
slight refactoring
Merge branch 'master' into ready-if-defaultView