Added support for blank query strings