fix: ensure updated CS event is emitted on all possible changes