diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java
index c38703c978432336f2d44f68cd895bef107a8485..3d6a78da3729b7aeb958a98412db0bce446e502d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java
@@ -207,11 +207,11 @@ public class IdentifierListDeliverer {
         	cursor = 0;
        	}        
         	            
-        if(cursor < listFurtherValues.getHits().getTotalHits()){
+        if(cursor <= listFurtherValues.getHits().getTotalHits()){
         	resTokenForResponse.setValue(listFurtherValues.getScrollId());
-			resTokenForResponse.setCompleteListSize(BigInteger.valueOf(listFurtherValues.getHits().getTotalHits()));
-			lit.setResumptionToken(resTokenForResponse);
         }
+		resTokenForResponse.setCompleteListSize(BigInteger.valueOf(listFurtherValues.getHits().getTotalHits()));
+		lit.setResumptionToken(resTokenForResponse);
 		
 		return listFurtherValues;
 	}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
index b36195c7802ab8cf1c0b84659d9feb25a4b5d2ef..1fa5fdcc286aa9308eecfcc985854207e1036495 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
@@ -434,7 +434,7 @@ public class RecordListDeliverer {
 		String identifierForHeader = "";
 		//System.out.println("DATESIZE: " + dates.size());
 		
-		if(dates.size() > 0){			
+		//if(dates.size() > 0){			
 			try {
 				header.setDatestamp(OAIPMHUtillities.convertDateFormat(this.modifiedValue).toXMLFormat());				
 			} catch (ParseException e) {
@@ -460,7 +460,7 @@ public class RecordListDeliverer {
 			header.getSetSpec().add(set);
 //			System.out.println("BLABLUBB");
 			// header.getSetSpec().add(this.collectionTitle);
-		}
+		//}
 		}
 		return header;
 	}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
index 67ab8e7cd51fcb0ceb9a49f46eea2fdf00892fde..594b52143f6ad7f1826fce919de3670b5e773c78 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -366,7 +366,7 @@ public class OaiPmhTest {
 		this.recordList.setIdentifierField("textgridUri");
 		this.recordList.setSearchResponseSize("100");
 
-		JAXBElement<OAIPMHType> r = this.request.getRequest("ListRecords", "","", "", "", "", "=");
+		JAXBElement<OAIPMHType> r = this.request.getRequest("ListRecords", "","oai_dc", "project:TGPR-355b6bcd-668d-5f79-e661-582305346ed1", "", "", "");
 		JAXB.marshal(r, System.out);
 		System.out.println("-----------------------------------\n");
 	}