fixes for Token/Typeahead behaviors