change handling of "labels"