track lock rebuild, bugfix in token selector and helpers