diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
index b16a4120ad34045c5cceef79143fd9ed0b26a4d9..6cd8567271dfb0e7336e8528f3a52337e06f6ae3 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
@@ -85,31 +85,24 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
     //long listSize = Queries.getAmountOfArtefacts();
 	    if (completeListSize > 0) {
 	        setFoundItems(true);
-	        int i = 0;
-	    
+	        int i = 0;	    
     
 	        for (SearchHit hit : scrollResp.getHits().getHits()) {
+	        	i++;
 	        	String textgridURI = hit.getFields().get("textgridUri").getValue().toString().replace(".0", "");
 	        	RecordDelivererIDIOM idiomRecord = new RecordDelivererIDIOM(true, false);
 	            identifierList.getHeader()
 	            .add(idiomRecord.getRecordById(textgridURI).getRecord().getHeader());
 	        }
-  /*  for (String artefactURI : artefactURIs) {
-      RecordDelivererIDIOM idiomRecord = new RecordDelivererIDIOM(true, false);
-      identifierList.getHeader()
-          .add(idiomRecord.getRecordById(artefactURI).getRecord().getHeader());
-      i++;
-    }*/
-    
-    
+
     // Check the need for a resumption token!
-    ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize,
-        resumptionToken, cursorCollector, scrollID, 30, i);
-    if (resTokenForResponse != null) {
-      identifierList.setResumptionToken(resTokenForResponse);
-    }
+	        ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize,
+	        		resumptionToken, cursorCollector, scrollID, 30, i);
+	        if (resTokenForResponse != null) {
+	        	identifierList.setResumptionToken(resTokenForResponse);
+	        }
 	    }else {
-	    	setFoundItems(false);
+	    		setFoundItems(false);
 	    }
     return identifierList;
   }
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
index 58fc35dfa03945d96eab35d472ab0039abf56b42..39d0ad2b09413dfe6f05086d2f1d228eae4a94ee 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -22,7 +22,7 @@
 	<bean id="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="locations">
 			<list>
-				<value>file:/etc/dhrep/oaipmh/oaipmh.properties</value>
+				<value>file:/etc/dhrep/oaipmh/oaipmh.properties_tmp</value>
 			</list>
 		</property>
 		<property name="ignoreResourceNotFound" value="true" />