PBUG-150: fix DOI search.

I'm in the process of testing this, but it is rather involved, so just checking in the fix first.
Merge branch 'pbug-150'