wip(cid): several fixes around cid instead of id