CMS-2528 Implement FilterQueryBuilderFactory

Added filter support, still some stuff to finish