Using lists for labeling was bad idea; fix