Adding support for multi-word queries