Added support for querying without parameters