updated tooltips support