Merged new tokenfield with typeahead support