fix retrigger/cancel to use request id