     previousSuggestions =
       for url, suggestion of @previousSuggestions
         continue unless RankingUtils.matches queryTerms, suggestion.title
-        # Reset the previous relevancy and HTML, they may not be correct wrt. the current query.
-        extend suggestion, relevancy: null, html: null
+        # Reset various fields, they may not be correct wrt. the current query.
+        extend suggestion, relevancy: null, html: null, highlightTerms: true, queryTerms: queryTerms
         suggestion.relevancy = null
         suggestion
 

        string.substring(end)
    string

  # Merges the given list of ranges such that any overlapping regions are combined. E.g.
  #   mergeRanges([0, 4], [3, 6]) => [0, 6].  A range is [startIndex, endIndex].
  mergeRanges: (ranges) ->

          title: suggestion
          insertText: suggestion
          highlightTerms: false
          highlightTermsExcludeUrl: true
          isCustomSearch: custom
          # The first (top) suggestion gets a score of 1.  This puts it two <Tab>s away if a domain completion
          # is present (which has a score of 2), and one <Tab> away otherwise.
