Modify job cancel and requeue to simplify interface