fix how BatchQuery builds query params