WIP filters to querybuilder