Further improvements to invenio-doctor