Fix problem when searching for multi-word expressions as a single word