fix access token format and add indexed