     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()

      node.contentEditable = false
      node.setAttribute('data-id', id)
      if @options.removeButton
        node.innerHTML = '<span class="remove-filter" data-id="'+id+'"><i class="fa fa-times-circle" data-id="'+id+'"></i></span><span class="filter-name">' + name + '</span>'
      else
        node.innerHTML = name


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

  removableToken: (id, name) ->
    return '<span class="remove-filter" data-id="'+id+'"><i class="fa fa-times-circle" data-id="'+id+'"></i></span><span class="filter-name">' + name + '</span>'

  # 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' }
