Fix the highlighting mechanism for Tao, refs ticket #21