Change QueryBuilder constructor to take KbpQuery.