Fixing issue #42 - component highlighting