JC-2006 fixed. Tooltip added