+ Fix recoverUi, remove collectUi