new indxjs token handling changes