Feature/querybuilder