diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html
index 91ec7aac9e..fb7090ca93 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html
@@ -10,35 +10,45 @@
             <md-grid-list cols="2" rowHeight="80px">
                 <md-grid-tile>
                     <md-input-container>
-                        <input mdInput
-                               [min]="minDate"
-                               [max]="maxDate"
-                        formControlName="startDate"
-                        [mdDatepicker]="startDatePicker"
-                        [value]="startDatePicker"
-                        (keydown)="true"
-                        placeholder="{{'DATE-WIDGET.START-DATE' | translate}}"
-                        id="startDate_id"
-                        required>
+                        <input
+                            mdInput
+                            [min]="minDate"
+                            [max]="maxDate"
+                            formControlName="startDate"
+                            [mdDatepicker]="startDatePicker"
+                            [value]="startDatePicker"
+                            (keydown)="true"
+                            placeholder="{{'DATE-WIDGET.START-DATE' | translate}}"
+                            id="startDate_id"
+                            required>
                         <button mdSuffix [mdDatepickerToggle]="startDatePicker"></button>
                     </md-input-container>
-                    <md-datepicker #startDatePicker [touchUi]="true" [startAt]="startAt" (selectedChanged)="onGroupValueChanged($event)"></md-datepicker>
+                    <md-datepicker
+                        #startDatePicker
+                        [touchUi]="true"
+                        (selectedChanged)="onGroupValueChanged()">
+                    </md-datepicker>
                 </md-grid-tile>
                 <md-grid-tile>
                     <md-input-container class="adf-start-task-input-container">
-                        <input mdInput
-                               [min]="minDate"
-                               [max]="maxDate"
-                        formControlName="endDate"
-                        [mdDatepicker]="endDatePicker"
-                        [value]="endDatePicker"
-                        (keydown)="true"
-                        placeholder="{{'DATE-WIDGET.END-DATE' | translate}}"
-                        id="endDate_id"
-                        required>
+                        <input
+                            mdInput
+                            [min]="minDate"
+                            [max]="maxDate"
+                            formControlName="endDate"
+                            [mdDatepicker]="endDatePicker"
+                            [value]="endDatePicker"
+                            (keydown)="true"
+                            placeholder="{{'DATE-WIDGET.END-DATE' | translate}}"
+                            id="endDate_id"
+                            required>
                         <button mdSuffix [mdDatepickerToggle]="endDatePicker"></button>
                     </md-input-container>
-                    <md-datepicker #endDatePicker [touchUi]="true" [startAt]="startAt" (selectedChanged)="onGroupValueChanged($event)"></md-datepicker>
+                    <md-datepicker
+                        #endDatePicker
+                        [touchUi]="true"
+                        (selectedChanged)="onGroupValueChanged()">
+                    </md-datepicker>
                 </md-grid-tile>
             </md-grid-list>
 </div>
diff --git a/ng2-components/ng2-activiti-form/index.ts b/ng2-components/ng2-activiti-form/index.ts
index 55cc9edf7f..b1f33bd006 100644
--- a/ng2-components/ng2-activiti-form/index.ts
+++ b/ng2-components/ng2-activiti-form/index.ts
@@ -26,6 +26,7 @@ import { MaterialModule } from './src/components/material.module';
 import { StartFormComponent } from './src/components/start-form.component';
 import { ContentWidgetComponent } from './src/components/widgets/content/content.widget';
 import { MASK_DIRECTIVE, WIDGET_DIRECTIVES } from './src/components/widgets/index';
+import { WidgetComponent } from './src/components/widgets/widget.component';
 import { ActivitiAlfrescoContentService } from './src/services/activiti-alfresco.service';
 import { ActivitiContentService } from './src/services/activiti-content-service';
 import { EcmModelService } from './src/services/ecm-model.service';
@@ -90,7 +91,8 @@ export const ACTIVITI_FORM_PROVIDERS: any[] = [
     declarations: [
         ...ACTIVITI_FORM_DIRECTIVES,
         ...DEPRECATED_FORM_DIRECTIVES,
-        ...MASK_DIRECTIVE
+        ...MASK_DIRECTIVE,
+        WidgetComponent
     ],
     entryComponents: [
         ...WIDGET_DIRECTIVES
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.html
index 7f85c3153c..a005226e62 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.html
@@ -1,5 +1,5 @@
 <div class="adf-hyperlink-widget {{field.className}}">
-    <label class="adf-label" [attr.for]="field.id" [class.focus]="focus" >{{field.name}}<span *ngIf="isRequired()">*</span></label>
+    <label class="adf-label" [attr.for]="field.id">{{field.name}}<span *ngIf="isRequired()">*</span></label>
     <div>
         <a [href]="linkUrl" target="_blank" rel="nofollow">{{linkText}}</a>
     </div>
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.scss b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.scss
index c42d17803c..9c008d63db 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.scss
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.scss
@@ -5,10 +5,6 @@
         padding: 0.4375em 0;
         border-top: 0.84375em solid transparent;
 
-        .focus {
-            color: mat-color($primary);
-        }
-
         a {
             color: mat-color($primary);
         }
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts
index baaf5edd8c..72db663ffa 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts
@@ -19,6 +19,8 @@ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from
 import { ActivitiContentService } from 'ng2-activiti-form';
 import { ContentService, ThumbnailService } from 'ng2-alfresco-core';
 
+declare var require: any;
+
 @Component({
     selector: 'adf-process-attachment-list',
     styleUrls: ['./process-attachment-list.component.scss'],
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.html
index 9689c018d9..7c5d045ff3 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.html
@@ -37,7 +37,7 @@
     <div class="mdl-dialog__content">
         <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
             <label class="mdl-textfield__label" for="addVariableName">{{ 'DETAILS.VARIABLES.ADD_DIALOG.LABEL.NAME' |translate }}</label>
-            <input class="mdl-textfield__input" type="text" [(ngModel)]="variableName" id="addVariableName" [readonly]="editMode" />
+            <input class="mdl-textfield__input" type="text" [(ngModel)]="variableName" id="addVariableName" />
         </div>
         <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
             <label class="mdl-textfield__label" for="addVariableValue">{{ 'DETAILS.VARIABLES.ADD_DIALOG.LABEL.VALUE' |translate }}</label>
diff --git a/ng2-components/ng2-activiti-processlist/src/services/process.service.ts b/ng2-components/ng2-activiti-processlist/src/services/process.service.ts
index 46724367eb..13714ca0e0 100644
--- a/ng2-components/ng2-activiti-processlist/src/services/process.service.ts
+++ b/ng2-components/ng2-activiti-processlist/src/services/process.service.ts
@@ -113,7 +113,7 @@ export class ProcessService extends TaskListService {
      * @param appId
      * @returns {FilterProcessRepresentationModel[]}
      */
-    public createDefaultFilters(appId: string): Observable<FilterProcessRepresentationModel[]> {
+    public createDefaultFilters(appId: string): Observable<any[]> {
         let runnintFilter = this.getRunningFilterInstance(appId);
         let runnintObservable = this.addProcessFilter(runnintFilter);
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts
index a275001c50..039bc18fab 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts
@@ -19,6 +19,8 @@ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from
 import { ActivitiContentService } from 'ng2-activiti-form';
 import { ContentService, ThumbnailService } from 'ng2-alfresco-core';
 
+declare var require: any;
+
 @Component({
     selector: 'adf-task-attachment-list',
     styleUrls: ['./task-attachment-list.component.scss'],
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.html
index d25a49a619..2e83981bc0 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.html
@@ -20,7 +20,7 @@
         </i>
     </li>
 </div>
-<div *ngIf="!folderNode && root">
+<div *ngIf="!folderNode && hasRoot">
     <li class="adf-breadcrumb-item">
         <div class="adf-breadcrumb-item-current">
             {{ root }}
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts
index bd8c74d06c..76cfee41af 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts
@@ -41,6 +41,10 @@ export class BreadcrumbComponent implements OnChanges {
 
     route: PathElementEntity[] = [];
 
+    get hasRoot(): boolean {
+        return !!this.root;
+    }
+
     @Output()
     navigate: EventEmitter<PathElementEntity> = new EventEmitter<PathElementEntity>();
 
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.html
index 3487f5446d..f44e3d2cca 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.html
@@ -49,14 +49,13 @@
                     [node]="nodes"
                     [rowFilter]="rowFilter"
                     [imageResolver]="imageResolver"
-                    [permissionsStyle]="permissionsStyle"
                     [currentFolderId]="folderIdToShow"
-                    [selectionMode]="'single'"
+                    selectionMode="single"
                     [contextMenuActions]="false"
                     [contentActions]="false"
                     [allowDropFiles]="false"
                     [enablePagination]="!showingSearchResults"
-                    (folderChange)="onFolderChange($event)"
+                    (folderChange)="onFolderChange()"
                     (ready)="onFolderLoaded()"
                     data-automation-id="content-node-selector-document-list">
             <empty-folder-content>
diff --git a/ng2-components/ng2-alfresco-login/index.ts b/ng2-components/ng2-alfresco-login/index.ts
index 1540d15c53..13b659bfcc 100644
--- a/ng2-components/ng2-alfresco-login/index.ts
+++ b/ng2-components/ng2-alfresco-login/index.ts
@@ -16,12 +16,12 @@
  */
 
 import { ModuleWithProviders, NgModule } from '@angular/core';
-import { MdCheckboxModule, MdIconModule, MdInputModule, MdProgressSpinnerModule } from '@angular/material';
 import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core';
 
 import { LoginComponent } from './src/components/login.component';
 import { LoginFooterDirective } from './src/directives/login-footer.directive';
 import { LoginHeaderDirective } from './src/directives/login-header.directive';
+import { MaterialModule } from './src/material.module';
 
 export { LoginHeaderDirective } from './src/directives/login-header.directive';
 export { LoginFooterDirective } from './src/directives/login-footer.directive';
@@ -43,10 +43,7 @@ export const ALFRESCO_LOGIN_DIRECTIVES: any[] = [
 @NgModule({
     imports: [
         CoreModule,
-        MdInputModule,
-        MdIconModule,
-        MdCheckboxModule,
-        MdProgressSpinnerModule
+        MaterialModule
     ],
     declarations: [
         ...ALFRESCO_LOGIN_DIRECTIVES
@@ -63,9 +60,7 @@ export const ALFRESCO_LOGIN_DIRECTIVES: any[] = [
     ],
     exports: [
         ...ALFRESCO_LOGIN_DIRECTIVES,
-        MdInputModule,
-        MdIconModule,
-        MdCheckboxModule
+        MaterialModule
     ]
 })
 export class LoginModule {
diff --git a/ng2-components/ng2-alfresco-login/src/components/login.component.html b/ng2-components/ng2-alfresco-login/src/components/login.component.html
index 8b7b454352..426037b855 100644
--- a/ng2-components/ng2-alfresco-login/src/components/login.component.html
+++ b/ng2-components/ng2-alfresco-login/src/components/login.component.html
@@ -1,7 +1,7 @@
 <div class="adf-login-content"
      [style.background-image]="'url(' + backgroundImageUrl + ')'">
     <md-card class="adf-login-card-wide">
-        <form [formGroup]="form" (submit)="onSubmit(form.value, $event)">
+        <form [formGroup]="form" (submit)="onSubmit(form.value)">
 
             <md-card-header>
                 <md-card-title>
diff --git a/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts
index d262c3fc4b..553e50ee79 100644
--- a/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts
@@ -161,7 +161,7 @@ describe('AlfrescoLogin', () => {
 
         it('should render the default copyright text', () => {
             expect(element.querySelector('[data-automation-id="login-copyright"]')).toBeDefined();
-            expect(element.querySelector('[data-automation-id="login-copyright"]').innerText).toEqual('© 2016 Alfresco Software, Inc. All Rights Reserved.');
+            expect(element.querySelector('[data-automation-id="login-copyright"]').innerText).toEqual('&#169; 2016 Alfresco Software, Inc. All Rights Reserved.');
         });
 
         it('should render the customised copyright text', () => {
diff --git a/ng2-components/ng2-alfresco-login/src/components/login.component.ts b/ng2-components/ng2-alfresco-login/src/components/login.component.ts
index da45383d8c..244c0ae126 100644
--- a/ng2-components/ng2-alfresco-login/src/components/login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/login.component.ts
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-import { Component, EventEmitter, Input, OnInit, Output, TemplateRef, ViewEncapsulation } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output, TemplateRef, ViewEncapsulation } from '@angular/core';
+import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { FormSubmitEvent } from '../models/form-submit-event.model';
 
-declare let componentHandler: any;
 declare var require: any;
 
 enum LoginSteps {
@@ -59,7 +58,7 @@ export class LoginComponent implements OnInit {
     backgroundImageUrl: string = require('../assets/images/background.svg');
 
     @Input()
-    copyrightText: string = '© 2016 Alfresco Software, Inc. All Rights Reserved.';
+    copyrightText: string = '&#169; 2016 Alfresco Software, Inc. All Rights Reserved.';
 
     @Input()
     providers: string;
@@ -105,7 +104,8 @@ export class LoginComponent implements OnInit {
                 private authService: AlfrescoAuthenticationService,
                 private settingsService: AlfrescoSettingsService,
                 private translateService: AlfrescoTranslationService,
-                private logService: LogService) {
+                private logService: LogService,
+                private elementRef: ElementRef) {
         this.initFormError();
         this.initFormFieldsMessages();
     }
@@ -258,11 +258,7 @@ export class LoginComponent implements OnInit {
      */
     toggleShowPassword() {
         this.isPasswordShow = !this.isPasswordShow;
-        if (this.isPasswordShow) {
-            (<HTMLInputElement> document.getElementById('password')).type = 'text';
-        } else {
-            (<HTMLInputElement> document.getElementById('password')).type = 'password';
-        }
+        this.elementRef.nativeElement.querySelector('#password').type = this.isPasswordShow ? 'text' : 'password';
     }
 
     /**
@@ -270,10 +266,7 @@ export class LoginComponent implements OnInit {
      * @param field
      * @returns {boolean}
      */
-    isErrorStyle(field: FormGroup) {
-        if (typeof componentHandler !== 'undefined') {
-            componentHandler.upgradeAllRegistered();
-        }
+    isErrorStyle(field: AbstractControl) {
         return !field.valid && field.dirty && !field.pristine;
     }
 
diff --git a/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.spec.ts b/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.spec.ts
index bc51194872..ded5c8d737 100644
--- a/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.spec.ts
@@ -15,29 +15,40 @@
  * limitations under the License.
  */
 
-import { Injector } from '@angular/core';
-import { getTestBed, TestBed } from '@angular/core/testing';
+import { async, TestBed } from '@angular/core/testing';
 import { CoreModule } from 'ng2-alfresco-core';
+import { MaterialModule } from '../material.module';
+
 import { LoginComponent } from '../components/login.component';
 import { LoginFooterDirective } from './login-footer.directive';
 
 describe('LoginFooterDirective', () => {
-    let injector: Injector;
-    let loginFooterDirective: LoginFooterDirective;
+    let component: LoginComponent;
+    let directive: LoginFooterDirective;
 
-    beforeEach(() => {
+    beforeEach(async(() => {
         TestBed.configureTestingModule({
-            imports: [CoreModule.forRoot()],
-            providers: [
+            imports: [
+                CoreModule,
+                MaterialModule
+            ],
+            declarations: [
                 LoginFooterDirective,
                 LoginComponent
             ]
-        });
-        injector = getTestBed();
-        loginFooterDirective = injector.get(LoginFooterDirective);
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        let fixture = TestBed.createComponent(LoginComponent);
+        component = fixture.componentInstance;
+        directive = new LoginFooterDirective(component);
     });
 
-    it('is defined', () => {
-        expect(loginFooterDirective).toBeDefined();
+    it('applies tempalate to Login component', () => {
+        const template = {};
+        directive.template = template;
+        directive.ngAfterContentInit();
+        expect(component.footerTemplate).toBe(template);
     });
 });
diff --git a/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.spec.ts b/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.spec.ts
index 70f3669050..fe1d3cfdcb 100644
--- a/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.spec.ts
@@ -15,29 +15,40 @@
  * limitations under the License.
  */
 
-import { Injector } from '@angular/core';
-import { getTestBed, TestBed } from '@angular/core/testing';
+import { async, TestBed } from '@angular/core/testing';
 import { CoreModule } from 'ng2-alfresco-core';
+import { MaterialModule } from '../material.module';
+
 import { LoginComponent } from '../components/login.component';
 import { LoginHeaderDirective } from './login-header.directive';
 
 describe('LoginHeaderDirective', () => {
-    let injector: Injector;
-    let loginHeaderDirective: LoginHeaderDirective;
+    let component: LoginComponent;
+    let directive: LoginHeaderDirective;
 
-    beforeEach(() => {
+    beforeEach(async(() => {
         TestBed.configureTestingModule({
-            imports: [CoreModule.forRoot()],
-            providers: [
+            imports: [
+                CoreModule,
+                MaterialModule
+            ],
+            declarations: [
                 LoginHeaderDirective,
                 LoginComponent
             ]
-        });
-        injector = getTestBed();
-        loginHeaderDirective = injector.get(LoginHeaderDirective);
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        let fixture = TestBed.createComponent(LoginComponent);
+        component = fixture.componentInstance;
+        directive = new LoginHeaderDirective(component);
     });
 
-    it('is defined', () => {
-        expect(loginHeaderDirective).toBeDefined();
+    it('applies tempalate to Login component', () => {
+        const template = {};
+        directive.template = template;
+        directive.ngAfterContentInit();
+        expect(component.headerTemplate).toBe(template);
     });
 });
diff --git a/ng2-components/ng2-alfresco-login/src/material.module.ts b/ng2-components/ng2-alfresco-login/src/material.module.ts
new file mode 100644
index 0000000000..0b933652c7
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/src/material.module.ts
@@ -0,0 +1,39 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { NgModule } from '@angular/core';
+import {
+    MdCheckboxModule,
+    MdIconModule,
+    MdInputModule,
+    MdProgressSpinnerModule
+} from '@angular/material';
+
+export function modules() {
+    return [
+        MdCheckboxModule,
+        MdIconModule,
+        MdInputModule,
+        MdProgressSpinnerModule
+    ];
+}
+
+@NgModule({
+    imports: modules(),
+    exports: modules()
+})
+export class MaterialModule {}
diff --git a/ng2-components/ng2-alfresco-search/index.ts b/ng2-components/ng2-alfresco-search/index.ts
index 3427cbc3b2..c6abde3a92 100644
--- a/ng2-components/ng2-alfresco-search/index.ts
+++ b/ng2-components/ng2-alfresco-search/index.ts
@@ -59,7 +59,7 @@ export const ALFRESCO_SEARCH_PROVIDERS: [any] = [
 
 @NgModule({
     imports: [
-        DocumentListModule.forRoot(),
+        DocumentListModule,
         CoreModule,
         FormsModule,
         ReactiveFormsModule
diff --git a/ng2-components/ng2-alfresco-search/src/components/search-control.component.html b/ng2-components/ng2-alfresco-search/src/components/search-control.component.html
index f7d47f613f..ec26373420 100644
--- a/ng2-components/ng2-alfresco-search/src/components/search-control.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/search-control.component.html
@@ -4,33 +4,37 @@
             <i mdl-upgrade class="material-icons">search</i>
         </label>
         <div [class]="getTextFieldHolderClassName()">
-            <input mdl
-                   class="mdl-textfield__input"
-                   [type]="inputType"
-                   [autocomplete]="getAutoComplete()"
-                   data-automation-id="search_input"
-                   #searchInput
-                   id="searchControl"
-                   [formControl]="searchControl"
-                   [(ngModel)]="searchTerm"
-                   (focus)="onFocus($event)"
-                   (blur)="onBlur($event)"
-                   (keyup.escape)="onEscape($event)"
-                   (keyup.arrowdown)="onArrowDown($event)"
-                   aria-labelledby="searchLabel">
+            <input
+                mdl
+                class="mdl-textfield__input"
+                [type]="inputType"
+                [autocomplete]="getAutoComplete()"
+                data-automation-id="search_input"
+                #searchInput
+                id="searchControl"
+                [formControl]="searchControl"
+                [(ngModel)]="searchTerm"
+                (focus)="onFocus($event)"
+                (blur)="onBlur($event)"
+                (keyup.escape)="onEscape()"
+                (keyup.arrowdown)="onArrowDown()"
+                aria-labelledby="searchLabel">
             <label id="searchLabel" class="mdl-textfield__label" for="searchControl">{{'SEARCH.CONTROL.LABEL' | translate}}</label>
         </div>
     </div>
 </form>
-<adf-search-autocomplete #autocomplete *ngIf="liveSearchEnabled"
-                              [searchTerm]="liveSearchTerm"
-                              [rootNodeId]="liveSearchRoot"
-                              [resultType]="liveSearchResultType"
-                              [resultSort]="liveSearchResultSort"
-                              [maxResults]="liveSearchMaxResults"
-                              [highlight]="highlight"
-                              [ngClass]="{active: searchActive, valid: searchValid}"
-                              (fileSelect)="onFileClicked($event)"
-                              (searchFocus)="onAutoCompleteFocus($event)"
-                              (scrollBack)="onAutoCompleteReturn($event)"
-                              (cancel)="onAutoCompleteCancel($event)"></adf-search-autocomplete>
+<adf-search-autocomplete
+    #autocomplete
+    *ngIf="liveSearchEnabled"
+    [searchTerm]="liveSearchTerm"
+    [rootNodeId]="liveSearchRoot"
+    [resultType]="liveSearchResultType"
+    [resultSort]="liveSearchResultSort"
+    [maxResults]="liveSearchMaxResults"
+    [highlight]="highlight"
+    [ngClass]="{active: searchActive, valid: searchValid}"
+    (fileSelect)="onFileClicked($event)"
+    (searchFocus)="onAutoCompleteFocus($event)"
+    (scrollBack)="onAutoCompleteReturn($event)"
+    (cancel)="onAutoCompleteCancel($event)">
+</adf-search-autocomplete>
diff --git a/ng2-components/ng2-alfresco-search/src/components/search.component.ts b/ng2-components/ng2-alfresco-search/src/components/search.component.ts
index ed03248797..b50c3d45fc 100644
--- a/ng2-components/ng2-alfresco-search/src/components/search.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/search.component.ts
@@ -21,6 +21,8 @@ import { NodePaging, Pagination } from 'alfresco-js-api';
 import { AlfrescoTranslationService, NotificationService, SearchOptions, SearchService } from 'ng2-alfresco-core';
 import { PermissionModel } from 'ng2-alfresco-documentlist';
 
+declare var require: any;
+
 @Component({
     selector: 'adf-search, alfresco-search',
     styleUrls: ['./search.component.scss'],