another fix to server labeling feature