Fixed issue where multi-word queries were not supported