Highlight handler disabled until fixage