CMS-2528 Implement FilterQueryBuilderFactory

Renaming