DDF-675: fixed bad merge of Cql filter change