diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts
index 8d4ed06a5c..d35c0ce2b4 100644
--- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts
+++ b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts
@@ -180,9 +180,26 @@ export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnI
     private generateQuery(value: Partial<SearchDateRangeAdvanced>, field: string): string {
         let query = '';
         if (value.dateRangeType === DateRangeType.IN_LAST) {
-            query = `${field}:[NOW/DAY-${value.inLastValue}${value.inLastValueType} TO NOW/DAY+1DAY]`;
+            switch(value.inLastValueType) {
+                case InLastDateType.DAYS:
+                    startDate = startOfDay(subDays(new Date(), parseInt(value.inLastValue)));
+                    break;
+                case InLastDateType.WEEKS:
+                    startDate = startOfWeek(subWeeks(new Date(), parseInt(value.inLastValue)));
+                    break;
+                case InLastDateType.MONTHS:
+                    startDate = startOfMonth(subMonths(new Date(), parseInt(value.inLastValue)));
+                    break;
+                default:
+                    break;
+            }
+            endDate = endOfToday();
         } else if (value.dateRangeType === DateRangeType.BETWEEN) {
-            query = `${field}:['${formatISO(startOfDay(value.betweenStartDate))}' TO '${formatISO(endOfDay(value.betweenEndDate))}']`;
+            startDate = startOfDay(value.betweenStartDate);
+            endDate = endOfDay(value.betweenEndDate);
+        }
+        if (startDate && endDate) {
+            query = `${field}:['${formatISO(startDate)}' TO '${formatISO(endDate)}']`;
         }
         return query;
     }