Added multivalued="false" when needed on organisations, datasources and persons.
added multivalued="false" for fields needed for sorting
updated xpath to fetch the document url (webresource)