Match words in query using or relationship
Externalize match logic as streams
Remove searchWithVerb