Better highlight detection