Trigger for hightlighting added, tooltip on labels fixed