Fix OCR highlighting issues.
Merge pull request #866 from emmanuel-keller/1.5

Fix OCR highlighting issues.