Make highlights more robust.
Make highlights more robust.

stencila/substance,substance/substance,michael/substance-1,podviaznikov/substance,andene/substance,michael/substance-1,andene/substance,podviaznikov/substance,substance/substance