Improved highlighting for or