BZ-13213 Updated tooltip handling