diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.textgrid.properties b/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.textgrid.properties
index 602c5aa38e85f3a10b26cc2cb500d6339b97d945..ab0df658ac49cf574426e17af9bdf3748de23e47 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.textgrid.properties
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.textgrid.properties
@@ -1,6 +1,6 @@
-###############################################################################
-##  OAI-PMH Configuration File                                               ##
-###############################################################################
+##################################
+##  OAI-PMH Configuration File  ##
+##################################
 
 RS_ENDPOINT = https://dev.textgridlab.org/1.0/tgoaipmh
 
@@ -43,17 +43,17 @@ metadataFormatListInstance = MetadataFormatListDelivererTG
 ##  Field Settings  ##
 ######################
 
-fields = extent,work.subject,revision,edition.source.bibliographicCitation,edition.license,created,issued,format,identifier,dataContributor,textgridUri,project,project.id,relations.isDerivedFrom,title,pid.value,edition.isEditionOf,edition.agent.value,edition.license.licenseUri,edition.language,edition.source.bibliographicCitation.author.value,edition.source.bibliographicCitation.editor.value,edition.source.bibliographicCitation.editionTitle,edition.source.bibliographicCitation.placeOfPublication.value,edition.source.bibliographicCitation.publisher.value,edition.source.bibliographicCitation.editionNo,edition.source.bibliographicCitation.series,edition.source.bibliographicCitation.volume,edition.source.bibliographicCitation.issue,edition.source.bibliographicCitation.epage,edition.source.bibliographicCitation.spage,edition.source.bibliographicCitation.bibidentifier,work.abstract,work.genre,work.type,work.spatial.value,work.temporal.value,work.agent.value,work.subject.id.value,lastModified
-workFields = created,work.abstract,relations.isDerivedFrom,textgridUri,work.genre,title,work.type,work.spatial.value,work.temporal.spatial,work.agent.value,work.subject.id.value
+fields = extent, work.subject, revision, edition.source.bibliographicCitation, edition.license, created, issued, format, identifier, dataContributor, textgridUri, project, project.id, relations.isDerivedFrom, title, pid.value, edition.isEditionOf, edition.agent.value, edition.license.licenseUri, edition.language, edition.source.bibliographicCitation.author.value, edition.source.bibliographicCitation.editor.value, edition.source.bibliographicCitation.editionTitle, edition.source.bibliographicCitation.placeOfPublication.value, edition.source.bibliographicCitation.publisher.value, edition.source.bibliographicCitation.editionNo, edition.source.bibliographicCitation.series, edition.source.bibliographicCitation.volume, edition.source.bibliographicCitation.issue, edition.source.bibliographicCitation.epage, edition.source.bibliographicCitation.spage, edition.source.bibliographicCitation.bibidentifier, work.abstract, work.genre, work.type, work.spatial.value, work.temporal.value, work.agent.value, work.subject.id.value, lastModified
+workFields = created, work.abstract, relations.isDerivedFrom, textgridUri, work.genre, title, work.type, work.spatial.value, work.temporal.spatial, work.agent.value, work.subject.id.value
 
 ######################
 ## OpenAireRecords ###
 ######################
 
 oar.identifierField = pid.value
-oar.titleFields = title,edition.source.bibliographicCitation.editionTitle
-oar.dateFields = created,issued,lastModified
-oar.contributorFields = dataContributor,project
+oar.titleFields = title, edition.source.bibliographicCitation.editionTitle
+oar.dateFields = created, issued, lastModified
+oar.contributorFields = dataContributor, project
 oar.creatorFields = TODO
 oar.languageFields = edition.language
 oar.alternateIdentifierFields = textgridUri