Refactor searchbar into non-sentence form