Performance fix. Do not surround empty strings with span highlight