       return '' unless foundItem
       name = foundItem.name
       if self.options.removeButton
-        return '&nbsp;<span class="token" contenteditable="false" data-id="' + id + '"><span class="remove-filter" data-id="'+id+'"><i class="fa fa-times-circle" data-id="'+id+'"></i></span><span class="filter-name">' + name + '</span></span>&nbsp;'
+        return '&nbsp;<span class="token" contenteditable="false" data-id="' + id + '">'+self.removableToken(id, name)+'</span>&nbsp;'
       else
         return '&nbsp;<span class="token" contenteditable="false" data-id="' + id + '">' + name + '</span>&nbsp;'
     )

    else
      $(items[currentIndex]).addClass("selected")

  # This is meant to be an external function used to add items to the DOM
  # item is an object of the form:
  # { id: 'xyz', name: 'the display name' }

    equation.children('.token').each ->
      $(this).replaceWith('#' + $(this).data('id') + '#')

    if @options.removeButton
      self = this
      $(".token:not(:has(>.remove-filter))").each ->
        $(this).html(self.removableToken($(this).data('id'), $(this).text()))
    if @options.operators
      try
        @range = @getRange()
