Addressed .. Look at Util::FilterRuleClauseGenerator