Add log and fix token-id param reference