Fix APIs inprogress and queued