diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
index bb4abfa5502b9e0644b5ea07567ced87a725dd6f..b8ef66320930c36e29a1bc033d0b2cefe7c26f52 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDeliverer.java
@@ -60,7 +60,7 @@ public class RecordDeliverer {
 	private DublinCoreBuilder dbc = new DublinCoreBuilder(odt, of);
 	private OAI_ESClient oaiEsClient;
 	
-	String aggregatorURL = "http://textgrid-esx1.gwdg.de/1.0/aggregator/teicorpus/";
+	String aggregatorURL = "http://textgrid-esx2.gwdg.de/1.0/aggregator/teicorpus/";
 	
 	public RecordDeliverer(OAI_ESClient oaiEsClient){
 		this.oaiEsClient=oaiEsClient;
@@ -88,10 +88,10 @@ public class RecordDeliverer {
 						"edition.source.bibliographicCitation.bibidentifier")
 				.setId(id); 
 		
-		GetResponse tgObject = recordById.execute().actionGet();
-		
 		
+		GetResponse tgObject = recordById.execute().actionGet();
 		
+				
 		if(tgObject.isExists() && tgObject.getField("format").getValue().toString().equals("text/tg.edition+tg.aggregation+xml")){
 		
 			String workUri = tgObject.getField("edition.isEditionOf").getValue().toString();
@@ -208,12 +208,12 @@ public class RecordDeliverer {
 			titles.add(tgObject.getField("title").getValue().toString());
 			
 			furtherDCElements(workUri);
-			try {
+			//try {
 				recordHeader.setIdentifier(identifier);
-				recordHeader.setDatestamp(OAIPMHUtillities.datestampAsString(dates.get(0)));
-			} catch (ParseException e) {
+				recordHeader.setDatestamp(dates.get(0));
+			/*} catch (ParseException e) {
 				log.debug("Could not parse Datestamp out of: " + dates.get(0));
-			}
+			}*/
 			
 			setDCObject(odt, of);
 			record.setMetadata(dbc.getDC());
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 cb8e18fb26adb975ed737902de04215121c5a522..ba708631b41db90edd88dd7bc4c2b2db02307fe5 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java
@@ -49,7 +49,7 @@ public class RecordListDeliverer {
 	
 	private OAI_ESClient oaiEsClient;
 	
-	String aggregatorURL = "http://textgrid-esx1.gwdg.de/1.0/aggregator/teicorpus/";
+	String aggregatorURL = "http://textgrid-esx2.gwdg.de/1.0/aggregator/teicorpus/";
 	
 	public RecordListDeliverer(OAI_ESClient oaiEsClient){
 		this.oaiEsClient=oaiEsClient;
@@ -73,7 +73,7 @@ public class RecordListDeliverer {
 						"edition.source.bibliographicCitation.bibidentifier")
 				.setQuery(queryBuilder)
 				.setPostFilter(FilterBuilders.existsFilter("edition.isEditionOf"))
-				.setSize(10000);
+				.setSize(10);
 				
 		SearchResponse getRecordListItems = getRecordList.execute().actionGet();
 		
@@ -218,13 +218,13 @@ public class RecordListDeliverer {
 			setDCObject(odt, of);
 			
 			
-			try {
+			//try {
 				recordHeader.setIdentifier(identifiers.get(0));
-				recordHeader.setDatestamp(OAIPMHUtillities.datestampAsString(dates.get(0)));
+				recordHeader.setDatestamp(dates.get(0));
 				
-			} catch (ParseException e) {
+		/*	} catch (ParseException e) {
 				log.debug("Could not parse Datestamp out of: " + dates.get(0));
-			}
+			}*/
 			
 			listClearer();
 			
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 e6634c7e14fe6f6a28d609c9dd6717d00fbdd192..33c7c5128ded01848ab937f837e0045d6e953bf8 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -139,7 +139,7 @@ public class OaiPmhTest{
 	@Ignore
 	public void testGetRequestGetRecordError2() throws ParseException{
 		System.out.println("Test for the verb \"GetRecord\" with succesfull response");
-		JAXBElement<OAIPMHType> p = testRequest.getRequest("GetRecord", "vqmx.0", "oai_dc", "", "", "", "");
+		JAXBElement<OAIPMHType> p = testRequest.getRequest("GetRecord", "wr71.0", "oai_dc", "", "", "", "");
 		JAXB.marshal(p, System.out);
 		System.out.println("-----------------------------------\n");