diff --git a/Readme.md b/Readme.md
index c5fb86f..2e652da 100644
--- a/Readme.md
+++ b/Readme.md
@@ -129,7 +129,7 @@ Queries are applied to a range. The following types of ranges ranges are support
 }
 ```
 
-- **startDate**: The start date of the time range (ISO8601 format (YYYY-MM-DDThh:mm:ss.sTZD e.g. 1997-07-16T19:20:30.475+02:00 (omitting +02:00 falls back to the local time zone)).
+- **startDate**: The start date of the time range (ISO8601 format (YYYY-MM-DDThh:mm:ss.sTZD e.g. 1997-07-16T19:20:30.123+02:00 (omitting +02:00 falls back to the local time zone)). Additionally, ISO8601 format up to nano seconds is also supported (e.g. 1997-07-16T19:20:30.123456789+02:00).
 - **endDate**: The end date of the time range.
 
 
diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java
index 4d73a61..c814716 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java
@@ -407,8 +407,8 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
 
    @Test
    public void testDateRangeQuery() throws Exception {
-      String startDate = RequestRangeDate.format(0);
-      String endDate = RequestRangeDate.format(10);
+      String startDate = TimeUtils.format(0);
+      String endDate = TimeUtils.format(10);
       DAQQuery request = new DAQQuery(
             new RequestRangeDate(
                   startDate,
@@ -424,10 +424,14 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
       cellProcessors.add(new NotNull());
       queryFields.add(QueryField.iocSeconds);
       cellProcessors.add(new NotNull());
+      queryFields.add(QueryField.iocDate);
+      cellProcessors.add(new NotNull());
       queryFields.add(QueryField.iocMillis);
       cellProcessors.add(new NotNull());
       queryFields.add(QueryField.globalSeconds);
       cellProcessors.add(new NotNull());
+      queryFields.add(QueryField.globalDate);
+      cellProcessors.add(new NotNull());
       queryFields.add(QueryField.globalMillis);
       cellProcessors.add(new NotNull());
       queryFields.add(QueryField.shape);
@@ -470,10 +474,14 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
             assertEquals("" + pulse, customerMap.get(QueryField.pulseId.name()));
             assertEquals("" + TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)),
                   customerMap.get(QueryField.iocSeconds.name()));
+            assertEquals("" + TimeUtils.format(TestTimeUtils.getTimeFromPulseId(pulse)),
+                  customerMap.get(QueryField.iocDate.name()));
             assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)),
                   customerMap.get(QueryField.iocMillis.name()));
             assertEquals("" + TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)),
                   customerMap.get(QueryField.globalSeconds.name()));
+            assertEquals("" + TimeUtils.format(TestTimeUtils.getTimeFromPulseId(pulse)),
+                  customerMap.get(QueryField.globalDate.name()));
             assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)),
                   customerMap.get(QueryField.globalMillis.name()));
             assertEquals("[1]", customerMap.get(QueryField.shape.name()));
@@ -559,8 +567,8 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
    public void testDateRangeQueryNrOfBinsAggregate() throws Exception {
       long startTime = 0;
       long endTime = 99;
-      String startDate = RequestRangeDate.format(startTime);
-      String endDate = RequestRangeDate.format(endTime);
+      String startDate = TimeUtils.format(startTime);
+      String endDate = TimeUtils.format(endTime);
       DAQQuery request = new DAQQuery(
             new RequestRangeDate(
                   startDate,
@@ -651,8 +659,8 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
    public void testDateRangeQueryBinSizeAggregate() throws Exception {
       long startTime = 0;
       long endTime = 999;
-      String startDate = RequestRangeDate.format(startTime);
-      String endDate = RequestRangeDate.format(endTime);
+      String startDate = TimeUtils.format(startTime);
+      String endDate = TimeUtils.format(endTime);
       DAQQuery request = new DAQQuery(
             new RequestRangeDate(
                   startDate,
diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java
index beddca9..c5f30ee 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java
@@ -460,8 +460,8 @@ public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
 
    @Test
    public void testDateRangeQuery() throws Exception {
-      String startDate = RequestRangeDate.format(1000);
-      String endDate = RequestRangeDate.format(1010);
+      String startDate = TimeUtils.format(1000);
+      String endDate = TimeUtils.format(1010);
       DAQQuery request = new DAQQuery(
             new RequestRangeDate(
                   startDate,
@@ -547,8 +547,8 @@ public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
    public void testDateRangeQueryNrOfBinsAggregate() throws Exception {
       long startTime = 1000;
       long endTime = 1099;
-      String startDate = RequestRangeDate.format(startTime);
-      String endDate = RequestRangeDate.format(endTime);
+      String startDate = TimeUtils.format(startTime);
+      String endDate = TimeUtils.format(endTime);
       DAQQuery request = new DAQQuery(
             new RequestRangeDate(
                   startDate,
@@ -588,8 +588,8 @@ public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
    public void testDateRangeQueryBinSizeAggregate() throws Exception {
       long startTime = 10000;
       long endTime = 10999;
-      String startDate = RequestRangeDate.format(startTime);
-      String endDate = RequestRangeDate.format(endTime);
+      String startDate = TimeUtils.format(startTime);
+      String endDate = TimeUtils.format(endTime);
       DAQQuery request = new DAQQuery(
             new RequestRangeDate(
                   startDate,