Soft delete upgrade and bug fix