Bug fix for sample codes
Change highlighting logic