CAL-332 fix label
CAL-326 fix labels