Recover confirm_select flag
Duh
Recover tx_select flag
Rename
Rename