Fix clearing value list when switching between token types