KFSTP-1621 add short labels, just to make everything safe