Switch to using claim UUID for marker ID