Fix issues with hovering & highlighting