manager : improve selection
iop : update correctly mask states