adjust default labelling (backport)