Revert "Revert "consider _ as part of the token""

This reverts commit 15da2dd6c5a51e9e362990c804ba15c749d01495.