add/remove tokens with auto complete