Trying to fix https://www.ebi.ac.uk/panda/jira/browse/BSD-41. For the
moment, name/surname swapping is done. Minor other changes.