         url: bookmark.url
         title: if usePathAndTitle then bookmark.pathAndTitle else bookmark.title
         relevancyFunction: @computeRelevancy
-        displayUrl: bookmark.displayUrl
-        deDuplicate: not bookmark.displayUrl?
+        shortUrl: bookmark.shortUrl
+        deDuplicate: not bookmark.shortUrl?
     onComplete = @currentSearch.onComplete
     @currentSearch = null
     onComplete suggestions

        @bookmarks.filter (bookmark) =>
          suggestionTitle = if usePathAndTitle then bookmark.pathAndTitle else bookmark.title
          bookmark.hasJavascriptPrefix ?= Utils.hasJavascriptPrefix bookmark.url
          bookmark.displayUrl ?= "javascript:..." if bookmark.hasJavascriptPrefix
          suggestionUrl = bookmark.displayUrl ? bookmark.url
          RankingUtils.matches(@currentSearch.queryTerms, suggestionUrl, suggestionTitle)
      else
        []

    bookmark.children.forEach((child) => @traverseBookmarksRecursive child, results, bookmark) if bookmark.children

  computeRelevancy: (suggestion) ->
    RankingUtils.wordRelevancy(suggestion.queryTerms, suggestion.shortUrl ? suggestion.url, suggestion.title)

class HistoryCompleter
  filter: ({ queryTerms, seenTabToOpenCompletionList }, onComplete) ->
