Fix retrieve by token logic