Fixed column highlighting to use CFG