NXP-14879: again use terms filter builder instead of term one