diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
index 65fe767053cce1378a91240e2fbf2ca712699cfa..c50290494b00a303a7606a20c2ea617490e0f7d0 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
@@ -388,7 +388,6 @@ public class OAIPMHUtilities {
             return null;
           }
         } else if (fieldPathForESIndex.length == 1) {
-
           fieldResulsts.add(resultFromGetRequestInES.get(fieldPathForESIndex[i]).toString());
         } else {
           String res = singlePath.get(fieldPathForESIndex[i]).toString();
@@ -452,7 +451,8 @@ public class OAIPMHUtilities {
    * @return
    * @throws IOException
    */
-  protected static GetResponse getRcordByIDFromElasticSearch(String index, String idInElasticSearchIndex,
+  protected static GetResponse getRcordByIDFromElasticSearch(String index,
+      String idInElasticSearchIndex,
       String[] includes, String[] excludes) throws IOException {
 
     // Setting the source context for fetching the fields from the elastic search index
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
index f6a9ba3edd8676b24f117c9efc9303885a0b4e82..35f904bedf8d115a31ad7d373e8abc587da6f078 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
@@ -41,7 +41,7 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
   protected String[] publisherList;
   protected String[] relationList;
   protected String[] relationsForWorkList;
-  protected String[] rightList;
+  protected String[] rightsList;
   protected String[] sourceList;
   protected String[] subjectList;
   protected String[] titleList;
@@ -270,7 +270,7 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
    * @param rightsList
    */
   public void setRights(String[] rightsList) {
-    this.rightList = rightsList;
+    this.rightsList = rightsList;
   }
 
   /**
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
index 1f9cf00623a0b5857db0be73598ea8ee4f6134fd..0844936588982a7a277c6fbd0a9b9edd8cdb9ecd 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
@@ -220,7 +220,7 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
     result.setPublisher(DublinCoreFieldLoader.fillList(responseWorkValues, this.publisherList));
     result.setRelation(
         DublinCoreFieldLoader.fillList(responseWorkValues, this.relationList));
-    result.setRights(DublinCoreFieldLoader.fillList(responseWorkValues, this.rightList));
+    result.setRights(DublinCoreFieldLoader.fillList(responseWorkValues, this.rightsList));
     result.setSource(DublinCoreFieldLoader.fillList(responseWorkValues, this.sourceList));
     result.setSubject(DublinCoreFieldLoader.fillList(relatedWorkObject, this.subjectList));
     result.setTitle(DublinCoreFieldLoader.fillList(responseWorkValues, this.titleList));
@@ -257,7 +257,7 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
     result.setPublisher(DublinCoreFieldLoader.fillList(responseWorkValues, this.publisherList));
     result.setRelation(
         DublinCoreFieldLoader.fillList(responseWorkValues, this.relationList));
-    result.setRights(DublinCoreFieldLoader.fillList(responseWorkValues, this.rightList));
+    result.setRights(DublinCoreFieldLoader.fillList(responseWorkValues, this.rightsList));
     result.setSource(DublinCoreFieldLoader.fillList(responseWorkValues, this.sourceList));
     result.setSubject(DublinCoreFieldLoader.fillList(responseWorkValues, this.subjectList));
     result.setTitle(DublinCoreFieldLoader.fillList(responseWorkValues, this.titleList));
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
index afa3322b672d2ab9d1aabb03ff5a393a8c354919..6a986b4d7bdb00cbadbefda73aee21d1ffaa7681 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
@@ -68,7 +68,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
   private String[] publisherList;
   private String[] relationList;
   private String[] relationsForWorkList;
-  private String[] rightList;
+  private String[] rightsList;
   private String[] sourceList;
   private String[] subjectList;
   private String[] titleList;
@@ -349,7 +349,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
     result.setRelation(DublinCoreFieldLoader.fillList(hit, this.relationList));
     result.setRelation(
         DublinCoreFieldLoader.fillList(responseWorkValues, this.relationsForWorkList));
-    result.setRights(DublinCoreFieldLoader.fillList(hit, this.rightList));
+    result.setRights(DublinCoreFieldLoader.fillList(hit, this.rightsList));
     result.setSource(DublinCoreFieldLoader.fillList(hit, this.sourceList));
     result.setSubject(DublinCoreFieldLoader.fillList(hit, this.subjectList));
     result.setTitle(DublinCoreFieldLoader.fillList(hit, this.titleList));
@@ -382,7 +382,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
     result.setLanguage(DublinCoreFieldLoader.fillList(hit, this.languageList));
     result.setPublisher(DublinCoreFieldLoader.fillList(hit, this.publisherList));
     result.setRelation(DublinCoreFieldLoader.fillList(hit, this.relationList));
-    result.setRights(DublinCoreFieldLoader.fillList(hit, this.rightList));
+    result.setRights(DublinCoreFieldLoader.fillList(hit, this.rightsList));
     result.setSource(DublinCoreFieldLoader.fillList(hit, this.sourceList));
     result.setSubject(DublinCoreFieldLoader.fillList(hit, this.subjectList));
     result.setTitle(DublinCoreFieldLoader.fillList(hit, this.titleList));
@@ -579,7 +579,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
    * @param rightsList
    */
   public void setRights(String[] rightsList) {
-    this.rightList = rightsList;
+    this.rightsList = rightsList;
   }
 
   /**
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
index a4c44fa3bd3c1854fe4baab3c0375bbb6a7577b8..30f1e909a9196346c6cc02137dd28cbaec1c6728 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -268,6 +268,10 @@
 		<constructor-arg index="0" value="${textgrid}" />
 		<constructor-arg index="1" value="${dariah}" />
 
+		<!-- Properties from abstract class -->
+		<property name="fields" value="${fields}" />
+		<property name="workFields" value="${workFields}" />
+
 		<property name="dateOfObjectCreation"
 			value="${dateOfObjectCreation}" />
 		<property name="relationToFurtherMetadataObject"
@@ -276,16 +280,13 @@
 			value="${repositoryObjectURIPrefix}" />
 		<property name="modifiedField" value="${modifiedField}" />
 		<property name="identifierField" value="${identifierField}" />
-
 		<property name="rangeField" value="${rangeField}" />
 		<property name="formatField" value="${formatField}" />
 		<property name="formatToFilter" value="${formatToFilter}" />
 		<property name="searchResponseSize"
 			value="${searchResponseSize}" />
 
-		<property name="fields" value="${fields}" />
-		<property name="workFields" value="${workFields}" />
-
+		<!-- Properties from DC implementation class -->
 		<property name="contributors" value="${contributorList}" />
 		<property name="coverages" value="${coverageList}" />
 		<property name="creators" value="${creatorList}" />