Support for single queries, in addition to the batch mode