Codemirror match-highlight fixes