avoiding early filtering of potential blocking rules
merge master
slightly more liberal predicate selection, close #319
update tests