fix tags order and relabeled TCs