Tooltip handling fixed