*8473* Improve EndNote extraction (master branch)