update expansion handling for new word token