Fixed: warning messages in highlight when currentitem does not exist