#232117 better field label display