Added support for more than one word queries