TVD: fix CA id handling