diff --git a/ayanova/src/api/relative-date-filter-calculator.js b/ayanova/src/api/relative-date-filter-calculator.js
index 8fd03dcf..ddadb881 100644
--- a/ayanova/src/api/relative-date-filter-calculator.js
+++ b/ayanova/src/api/relative-date-filter-calculator.js
@@ -1,36 +1,11 @@
-// //TODO: Replace all this server code with equivalent client code
-/* Xeslint-disable */
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/*  Xeslint-disable    */
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-/*  
-
-      { name: vm.lt("DateRangeTomorrow"), id: "**" },
-      { name: vm.lt("DateRangeLastWeek"), id: "**" },
-      { name: vm.lt("DateRangeThisWeek"), id: "**" },
-      { name: vm.lt("DateRangeNextWeek"), id: "**" },
-      { name: vm.lt("DateRangeLastMonth"), id: "**" },
-      { name: vm.lt("DateRangeThisMonth"), id: "**" },
-      { name: vm.lt("DateRangeNextMonth"), id: "**" },
-      { name: vm.lt("DateRange14DayWindow"), id: "**" },
-      { name: vm.lt("DateRangePast"), id: "**" },
-      { name: vm.lt("DateRangeFuture"), id: "**" },
-      { name: vm.lt("DateRangeLastYear"), id: "**" }, 
-      { name: vm.lt("DateRangeThisYear"), id: "**" },
-      {
-        name: vm.lt("DateRangeInTheLastThreeMonths"),
-        id: "**"
-      },
-      {
-        name: vm.lt("DateRangeInTheLastSixMonths"),
-        id: "**"
-      },
-      { name: vm.lt("DateRangePastYear"), id: "**" }, //last 365 days
-
-      { name: vm.lt("DateRangePast90Days"), id: "**" },
-      { name: vm.lt("DateRangePast30Days"), id: "**" },
-      { name: vm.lt("DateRangePast24Hours"), id: "**" } */
 /////////////////////////////////
 // Convert a date token to local
-// date range suitable for query
+// date range to UTC for server
+// dataListView consumption
 //
 export default {
   ///////////////////////////////
@@ -60,6 +35,7 @@ export default {
           .toString();
         ret.before = dtToday.toUTC().toString();
         break;
+
       case "*today*":
         //Between yesterday at midnight and tommorow at midnight
         ret.after = dtToday
@@ -71,6 +47,7 @@ export default {
           .toUTC()
           .toString();
         break;
+
       case "*tomorrow*":
         //Between Tonight at midnight and day after tommorow at midnight
         ret.after = dtToday
@@ -82,6 +59,7 @@ export default {
           .toUTC()
           .toString();
         break;
+
       case "*lastweek*":
         //Between two Sundays ago at midnight and last sunday at midnight
 
@@ -156,8 +134,8 @@ export default {
         //set return values from calculated values
         ret.after = dtAfter.toUTC().toString();
         ret.before = dtBefore.toUTC().toString();
-
         break;
+
       case "*lastmonth*":
         //start with the first day of this month
         var dtAfter = window.$gz.DateTime.local(dtNow.year, dtNow.month, 1);
@@ -238,7 +216,6 @@ export default {
 
       case "*lastyear*":
         //"last year" means prior calendar year from start of january to end of december
-
         //start with the first day of this year
         var dtAfter = window.$gz.DateTime.local(dtNow.year);
 
@@ -254,12 +231,10 @@ export default {
         //set return values from calculated values
         ret.after = dtAfter.toUTC().toString();
         ret.before = dtBefore.toUTC().toString();
-
         break;
 
       case "*thisyear*":
         //From zero hour january 1 this year (minus a second) to zero hour jan 1 next year
-
         //start with the first day of this year
         var dtAfter = window.$gz.DateTime.local(dtNow.year);
 
@@ -273,7 +248,6 @@ export default {
         //set return values from calculated values
         ret.after = dtAfter.toUTC().toString();
         ret.before = dtBefore.toUTC().toString();
-
         break;
 
       case "*last3months*":
@@ -289,7 +263,6 @@ export default {
         //set return values from calculated values
         ret.after = dtAfter.toUTC().toString();
         ret.before = dtBefore.toUTC().toString();
-
         break;
 
       case "*last6months*":
@@ -305,7 +278,6 @@ export default {
         //set return values from calculated values
         ret.after = dtAfter.toUTC().toString();
         ret.before = dtBefore.toUTC().toString();
-
         break;
 
       case "*pastyear*": //within the prior 365 days before today
@@ -321,7 +293,6 @@ export default {
         //set return values from calculated values
         ret.after = dtAfter.toUTC().toString();
         ret.before = dtBefore.toUTC().toString();
-
         break;
 
       case "*past90days*":
@@ -337,7 +308,6 @@ export default {
         //set return values from calculated values
         ret.after = dtAfter.toUTC().toString();
         ret.before = dtBefore.toUTC().toString();
-
         break;
 
       case "*past30days*":
@@ -353,7 +323,6 @@ export default {
         //set return values from calculated values
         ret.after = dtAfter.toUTC().toString();
         ret.before = dtBefore.toUTC().toString();
-
         break;
 
       case "*past24hours*":
@@ -369,7 +338,6 @@ export default {
         //set return values from calculated values
         ret.after = dtAfter.toUTC().toString();
         ret.before = dtBefore.toUTC().toString();
-
         break;
 
       default: