#7365 nullable queryBuilder in FilteredQueryBuilder to match rest api