Made changeds to allow multi-word queries