more tokenize on enter support