Fixup of getByToken migration