Added support for a blank query