diff --git a/lib/content-services/search/components/search-date-range/search-date-range.component.html b/lib/content-services/search/components/search-date-range/search-date-range.component.html
index f4c2321dc8..d624fb4400 100644
--- a/lib/content-services/search/components/search-date-range/search-date-range.component.html
+++ b/lib/content-services/search/components/search-date-range/search-date-range.component.html
@@ -1,6 +1,9 @@
 <form [formGroup]="form" novalidate (ngSubmit)="apply(form.value, form.valid)">
     <mat-form-field>
-        <input matInput [formControl]="from" [errorStateMatcher]="matcher"
+        <input matInput
+                (input)="forcePlaceholder($event)"
+                [formControl]="from"
+                [errorStateMatcher]="matcher"
                 placeholder="{{ 'SEARCH.FILTER.RANGE.FROM-DATE' | translate }}"
                 [matDatepicker]="fromDatepicker"
                 [max]="maxDate"
@@ -19,7 +22,10 @@
     </mat-form-field>
 
     <mat-form-field>
-        <input matInput [formControl]="to" [errorStateMatcher]="matcher"
+        <input matInput
+                (input)="forcePlaceholder($event)"
+                [formControl]="to"
+                [errorStateMatcher]="matcher"
                 placeholder="{{ 'SEARCH.FILTER.RANGE.TO-DATE' | translate }}"
                 [matDatepicker]="toDatepicker"
                 [min]="from.value"
diff --git a/lib/content-services/search/components/search-date-range/search-date-range.component.ts b/lib/content-services/search/components/search-date-range/search-date-range.component.ts
index 9fd23fd46a..a0e55e4e35 100644
--- a/lib/content-services/search/components/search-date-range/search-date-range.component.ts
+++ b/lib/content-services/search/components/search-date-range/search-date-range.component.ts
@@ -126,4 +126,9 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit {
     hasParseError(formControl) {
         return formControl.hasError('matDatepickerParse') && formControl.getError('matDatepickerParse').text;
     }
+
+    forcePlaceholder(event: any) {
+        event.srcElement.click();
+    }
+
 }
diff --git a/lib/content-services/search/search-query-builder.service.ts b/lib/content-services/search/search-query-builder.service.ts
index f19b0f04d5..41306c6795 100644
--- a/lib/content-services/search/search-query-builder.service.ts
+++ b/lib/content-services/search/search-query-builder.service.ts
@@ -162,8 +162,10 @@ export class SearchQueryBuilderService {
 
     async execute() {
         const query = this.buildQuery();
-        const data = await this.alfrescoApiService.searchApi.search(query);
-        this.executed.next(data);
+        if (query) {
+            const data = await this.alfrescoApiService.searchApi.search(query);
+            this.executed.next(data);
+        }
     }
 
     buildQuery(): QueryBody {