Minor refactor of search and stop words.