bugfix in tokenset navigation