add 'all status tokens as well as current'