diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java
index 0253ea54a5233e4f0cffafedada6766e5c1f6027..a9d094930ddd750542d965e578f4b47f2a474096 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java
@@ -52,6 +52,8 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
   private int totalHits;
   private String idiomRbacSessionID;
   private String idiomTgcrudEndpoint;
+  private String from;
+  private String until;
 
   private static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
   private static Map<String, String> fromUntilCollector = new Hashtable<String, String>();
@@ -66,26 +68,14 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
   }
 
   /**
-   * 
+   * @param tgcrudEndpoint
+   * @param rbacSessionID
    */
   public IDIOMImages(String tgcrudEndpoint, String rbacSessionID) {
     this.idiomTgcrudEndpoint = tgcrudEndpoint;
     this.idiomRbacSessionID = rbacSessionID;
   }
 
-  /**
-   * 
-   * @throws JSONException
-   * @throws IOException
-   * @throws ParseException
-   * @throws SAXException
-   * @throws TransformerException
-   * @throws TransformerFactoryConfigurationError
-   */
-
-  private String from;
-  private String until;
-
   /**
    *
    */
@@ -206,7 +196,8 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
 
     try {
       // Get TG-crud client (if not yet existing)
-      // TODO If tgcrud client has got a fix endpoint, could it be created elsewhere??
+      // TODO If tgcrud client has got a fix endpoint, should the client better be created
+      // elsewhere??
       if (tgCrudClient == null) {
         tgCrudClient = new CrudClient(this.idiomTgcrudEndpoint).enableGzipCompression();
       }
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
index b09f3c19cb6bd90367eef0d987bebdd19459b96c..076c23f82932042726caf08b458cff55c84a5457 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
@@ -134,6 +134,7 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
         // Create new record here!
         // NOTE We must not set only references here!!
         RecordType record = new RecordType();
+        // No base URI here! We query elasticsearch, and so it needs to be a revision URI!
         RecordType sourceRecord = this.idiomRecord.getRecordById(textgridURI).getRecord();
         record.setHeader(sourceRecord.getHeader());
         record.setMetadata(sourceRecord.getMetadata());
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OAIPMHUtilitiesOnline.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OAIPMHUtilitiesOnline.java
index 97f65bbc257f8c8a81b2e2a4a68aff74ee7ec00e..8fb28f3c255dae2936465fcf190d49638d422901 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OAIPMHUtilitiesOnline.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OAIPMHUtilitiesOnline.java
@@ -37,11 +37,11 @@ public class OAIPMHUtilitiesOnline {
 
   // ## CHANGE SETTINGS BELOW FOR SETTING TEST SCOPE ---------------------------------------------
 
-  // public static final String PROPERTIES_FILE = "oaipmh.test.textgridlab-org.properties";
-  public static final String PROPERTIES_FILE = "oaipmh.test.dev-textgridlab-org.properties";
+  public static final String PROPERTIES_FILE = "oaipmh.test.textgridlab-org.properties";
+  // public static final String PROPERTIES_FILE = "oaipmh.test.dev-textgridlab-org.properties";
 
-  // public static final boolean TEST_ALL_PAGES = false;
-  public static final boolean TEST_ALL_PAGES = true;
+  public static final boolean TEST_ALL_PAGES = false;
+  // public static final boolean TEST_ALL_PAGES = true;
 
   // ## CHANGE SETTINGS ABOVE FOR SETTING TEST SCOPE ---------------------------------------------
 
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListRecordsOnline.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListRecordsOnline.java
index 5fadffbf45707acd4edef1573e88c578790a7dda..11def47aa6619b53fc203898172fe0ddce6184be 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListRecordsOnline.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListRecordsOnline.java
@@ -24,7 +24,7 @@ import info.textgrid.middleware.test.online.OAIPMHUtilitiesOnline;
  * @version 2022-09-26
  * @since 2022-09-12
  */
-// @Ignore
+@Ignore
 public class TestTGListRecordsOnline {
 
   // **