adding support for setting a query's batch object to None