Clean out more words before search.

Thanks to @jkaberg