Tweaking highlight logic