resolved value bug + token for all api