diff --git a/lib/content-services/content-node-selector/content-node-selector-panel.component.html b/lib/content-services/content-node-selector/content-node-selector-panel.component.html
index e0e6571cb7..e3a3233421 100644
--- a/lib/content-services/content-node-selector/content-node-selector-panel.component.html
+++ b/lib/content-services/content-node-selector/content-node-selector-panel.component.html
@@ -79,8 +79,8 @@
             <data-columns>
                 <data-column key="$thumbnail" type="image"></data-column>
                 <data-column key="name" type="text" class="full-width ellipsis-cell">
-                    <ng-template let-context="$implicit">
-                        <adf-name-location-cell [data]="context.data" [column]="context.col" [row]="context.row"></adf-name-location-cell>
+                    <ng-template let-context>
+                        <adf-name-location-cell [row]="context.row"></adf-name-location-cell>
                     </ng-template>
                 </data-column>
                 <data-column key="modifiedAt" type="date" format="timeAgo" class="adf-content-selector-modified-cell"></data-column>
diff --git a/lib/content-services/content-node-selector/name-location-cell/name-location-cell.component.ts b/lib/content-services/content-node-selector/name-location-cell/name-location-cell.component.ts
index 61800cbc9d..5fd47726cc 100644
--- a/lib/content-services/content-node-selector/name-location-cell/name-location-cell.component.ts
+++ b/lib/content-services/content-node-selector/name-location-cell/name-location-cell.component.ts
@@ -15,29 +15,36 @@
  * limitations under the License.
  */
 
-import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation } from '@angular/core';
-import { DataTableCellComponent } from '@alfresco/adf-core';
+import { Input, ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { DataRow } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-name-location-cell',
     template: `
-    <div class="adf-name-location-cell-name">{{ name }}</div>
-    <div class="adf-name-location-cell-location" [title]="path?.name">{{ path?.name }}</div>
+        <div class="adf-name-location-cell-name">{{ name }}</div>
+        <div class="adf-name-location-cell-location" [title]="path">{{ path }}</div>
     `,
     styleUrls: ['./name-location-cell.component.scss'],
     encapsulation: ViewEncapsulation.None,
     changeDetection: ChangeDetectionStrategy.OnPush,
     host: { class: 'adf-name-location-cell' }
 })
-export class NameLocationCellComponent extends DataTableCellComponent implements OnInit {
+export class NameLocationCellComponent implements OnInit {
 
-    path: string = '';
     name: string = '';
+    path: string = '';
+
+    @Input()
+    row: DataRow;
 
     ngOnInit() {
         if (this.row) {
-            this.path = this.row.getValue('path');
             this.name = this.row.getValue('name');
+
+            const fullPath = this.row.getValue('path');
+            if (fullPath) {
+                this.path = fullPath.name || '';
+            }
         }
     }
 }
diff --git a/lib/core/form/components/widgets/date/date.widget.html b/lib/core/form/components/widgets/date/date.widget.html
index a36cc48232..cfca144b8d 100644
--- a/lib/core/form/components/widgets/date/date.widget.html
+++ b/lib/core/form/components/widgets/date/date.widget.html
@@ -16,6 +16,6 @@
     </mat-form-field>
     <error-widget [error]="field.validationSummary"></error-widget>
     <error-widget *ngIf="isInvalidFieldRequired()" required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget>
-    <mat-datepicker #datePicker [touchUi]="true" [startAt]="startAt" ></mat-datepicker>
+    <mat-datepicker #datePicker [touchUi]="true" [startAt]="displayDate" ></mat-datepicker>
 </div>
 
diff --git a/lib/core/form/components/widgets/people/people.widget.html b/lib/core/form/components/widgets/people/people.widget.html
index 386b051e76..9bf4e0c740 100644
--- a/lib/core/form/components/widgets/people/people.widget.html
+++ b/lib/core/form/components/widgets/people/people.widget.html
@@ -1,5 +1,4 @@
 <div class="adf-people-widget {{field.className}}"
-     [class.is-dirty]="value"
      [class.adf-invalid]="!field.isValid"
      [class.adf-readonly]="field.readOnly"
      id="people-widget-content">