FW-519. change order HighlightVisitor