Fix bugs introduced with move to use kie-commons Filter