Changes to support calibre 0.9.42
LP:1205702 (MR:met67) - Highlighting issues
Fixes nested Kobo span tags, which caused various issues with highlighting.