Target/iser: Improve cm events handling