Simplify filterSuggestionsForText logic

And move updateSearchResultsForText into it