JAL-2808 revised util.matcher package, 2 filter conditions per feature