JC-1928 fixed. Correct tooltips added