Add support for queries with no block