Replace hyphen with space when escaping queries

Otherwise words containing hyphens are not found.

Before: “add on” finds “add-on” but, “add-on” does not
After: both return result
Add test for querying whole strings