diff --git a/demo-shell-ng2/app/components/search/search.component.html b/demo-shell-ng2/app/components/search/search.component.html
index 8adba65974..93568e6b8d 100644
--- a/demo-shell-ng2/app/components/search/search.component.html
+++ b/demo-shell-ng2/app/components/search/search.component.html
@@ -1,4 +1,8 @@
-<div>
+<div class="search-results-container">
     <h1>Search results</h1>
-    <alfresco-search></alfresco-search>
-</div>
\ No newline at end of file
+    <alfresco-search (preview)="onFileClicked($event)"></alfresco-search>
+</div>
+
+<alfresco-viewer [(showViewer)]="previewActive" [urlFile]="previewContentUrl" [fileName]="previewName" [mimeType]="previewMimeType" [overlayMode]="true">
+    <div class="mdl-spinner mdl-js-spinner is-active"></div>
+</alfresco-viewer>
diff --git a/demo-shell-ng2/app/components/search/search.component.ts b/demo-shell-ng2/app/components/search/search.component.ts
index 4a8bf72da3..77067b5ff6 100644
--- a/demo-shell-ng2/app/components/search/search.component.ts
+++ b/demo-shell-ng2/app/components/search/search.component.ts
@@ -16,7 +16,9 @@
  */
 
 import { Component } from '@angular/core';
+import { AlfrescoContentService } from 'ng2-alfresco-core';
 import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search';
+import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer';
 
 declare let __moduleName: string;
 
@@ -25,17 +27,34 @@ declare let __moduleName: string;
     selector: 'search-component',
     templateUrl: './search.component.html',
     styles: [`
-        :host div {
-            padding: 0 20px;
+        :host div.search-results-container {
+            padding: 0 20px 20px 20px;
         }
         :host h1 {
             font-size: 22px;
         }
+        :host tbody tr {
+            cursor: pointer;
+        }
     `],
-    directives: [ ALFRESCO_SEARCH_DIRECTIVES ]
+    directives: [ ALFRESCO_SEARCH_DIRECTIVES, VIEWERCOMPONENT ]
 })
 export class SearchComponent {
-    constructor() {
-        console.log('SearchComponent constructor');
+
+    previewContentUrl: string;
+    previewName: string;
+    previewMimeType: string;
+    previewActive: boolean = false;
+
+    constructor(public contentService: AlfrescoContentService) {
+    }
+
+    onFileClicked(event) {
+        if (event.value.entry.isFile) {
+            this.previewName = event.value.entry.name;
+            this.previewMimeType = event.value.entry.content.mimeType;
+            this.previewContentUrl = this.contentService.getContentUrl(event.value);
+            this.previewActive = true;
+        }
     }
 }
diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json
index 5e3d1cef7d..b6c27507bd 100644
--- a/demo-shell-ng2/package.json
+++ b/demo-shell-ng2/package.json
@@ -52,46 +52,46 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
+    "zone.js": "0.6.12",
 
-    "material-design-icons": "^2.2.3",
-    "material-design-lite": "^1.1.3",
+    "rimraf": "2.5.2",
+    "material-design-icons": "2.2.3",
+    "material-design-lite": "1.1.3",
     "ng2-translate": "2.2.0",
-    "pdfjs-dist": "^1.5.258",
+    "pdfjs-dist": "1.5.258",
+    "flag-icon-css": "2.3.0",
 
-    "alfresco-js-api": "^0.1.0",
-    "ng2-alfresco-core": "^0.1.0",
-    "ng2-alfresco-datatable": "^0.1.0",
-    "ng2-alfresco-documentlist": "^0.1.0",
-    "ng2-alfresco-login": "^0.1.0",
-    "ng2-alfresco-search": "^0.1.9",
-    "ng2-alfresco-upload": "^0.1.0",
-    "ng2-alfresco-viewer": "^0.1.13",
-    "rimraf": "^2.5.2"
+    "alfresco-js-api": "0.1.0",
+    "ng2-alfresco-core": "0.1.36",
+    "ng2-alfresco-datatable": "0.1.12",
+    "ng2-alfresco-documentlist": "0.1.34",
+    "ng2-alfresco-login": "0.1.29",
+    "ng2-alfresco-search": "0.1.21",
+    "ng2-alfresco-upload": "0.1.49",
+    "ng2-alfresco-viewer": "0.1.32"
   },
   "devDependencies": {
-    "browser-sync": "^2.10.0",
-    "concurrently": "^2.0.0",
-    "connect-history-api-fallback": "^1.2.0",
-    "flag-icon-css": "^2.3.0",
-    "license-check": "^1.0.4",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "browser-sync": "2.10.0",
+    "concurrently": "2.0.0",
+    "connect-history-api-fallback": "1.2.0",
+    "license-check": "1.1.5",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4"
   },
   "license-check-config": {
     "src": [
diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index 4dd719ed99..f753c51e85 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng2-alfresco-core",
   "description": "Alfresco Angular 2 Components core",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "clean": "rimraf dist node_modules typings",
@@ -55,42 +55,46 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
-    "angular2-in-memory-web-api": "0.0.12",
-    "core-js": "^2.4.0",
-    "ng2-translate": "2.2.0",
-    "reflect-metadata": "^0.1.3",
-    "rimraf": "^2.5.2",
-    "rxjs": "5.0.0-beta.6",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "zone.js": "^0.6.12"
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
+    "rxjs": "5.0.0-beta.6",
+    "zone.js": "0.6.12",
+    "ng2-translate": "2.2.2",
+    "rimraf": "2.5.2"
+  },
+  "peerDependencies": {
+    "material-design-icons": "^2.2.3",
+    "material-design-lite": "^1.1.3"
   },
   "devDependencies": {
-    "cpx": "^1.3.1",
+    "cpx": "1.3.1",
     "coveralls": "^2.11.9",
     "http-server": "0.8.5",
-    "jasmine-ajax": "^3.2.0",
+    "jasmine-ajax": "3.2.0",
     "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-mocha-reporter": "^2.0.3",
-    "karma-jasmine-html-reporter": "^0.2.0",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "karma": "0.13.22",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-coverage": "1.0.0",
+    "karma-jasmine": "1.0.2",
+    "karma-mocha-reporter": "2.0.3",
+    "karma-jasmine-html-reporter": "0.2.0",
+    "license-check": "1.1.5",
+    "remap-istanbul": "0.6.3",
+    "traceur": "0.0.91",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4"
   },
   "license-check-config": {
     "src": [
diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts
index e410c97421..a63322914e 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts
@@ -16,17 +16,15 @@
  */
 
 import { Injectable, Optional } from '@angular/core';
-import { Http } from '@angular/http';
 import { MissingTranslationHandler, TranslateService } from 'ng2-translate/ng2-translate';
 import { AlfrescoTranslationLoader } from './AlfrescoTranslationLoader.service';
 
 @Injectable()
 export class AlfrescoTranslationService extends TranslateService {
     userLang: string = 'en' ;
-    currentLoader: AlfrescoTranslationLoader;
 
-    constructor(http: Http, currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) {
-        super(http, currentLoader, missingTranslationHandler);
+    constructor(public currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) {
+        super(currentLoader, missingTranslationHandler);
         this.userLang = navigator.language.split('-')[0]; // use navigator lang if available
         this.userLang = /(fr|en)/gi.test(this.userLang) ? this.userLang : 'en';
         this.setDefaultLang(this.userLang);
diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json
index 141af69f4c..d12da1e1ed 100644
--- a/ng2-components/ng2-alfresco-datatable/demo/package.json
+++ b/ng2-components/ng2-alfresco-datatable/demo/package.json
@@ -23,34 +23,35 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
-    "rimraf": "^2.5.2",
+    "zone.js": "0.6.12",
 
-    "material-design-icons": "^2.2.3",
-    "material-design-lite": "^1.1.3",
-    "ng2-alfresco-datatable": "^0.1.0"
+    "rimraf": "2.5.2",
+    "material-design-icons": "2.2.3",
+    "material-design-lite": "1.1.3",
+
+    "ng2-alfresco-datatable": "0.1.12"
   },
   "devDependencies": {
-    "browser-sync": "^2.10.0",
-    "concurrently": "^2.0.0",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4",
-    "wsrv": "^0.1.0"
+    "browser-sync": "2.10.0",
+    "concurrently": "2.0.0",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4",
+    "wsrv": "0.1.3"
   },
   "keywords": [
     "angular2",
diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json
index e94fbe425d..e3b7c7dded 100644
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng2-alfresco-datatable",
   "description": "Alfresco Angular2 DataTable Component",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "clean": "rimraf dist node_modules typings",
@@ -51,45 +51,45 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
-    "rimraf": "^2.5.2"
+    "zone.js": "0.6.12",
+    "rimraf": "2.5.2"
   },
   "peerDependencies": {
     "material-design-icons": "^2.2.3",
     "material-design-lite": "^1.1.3"
   },
   "devDependencies": {
-    "concurrently": "^2.1.0",
-    "coveralls": "^2.11.9",
-    "cpx": "^1.3.1",
+    "concurrently": "2.1.0",
+    "coveralls": "2.11.9",
+    "cpx": "1.3.1",
     "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-jasmine-html-reporter": "^0.2.0",
-    "karma-mocha-reporter": "^2.0.3",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4",
-    "wsrv": "^0.1.0"
+    "karma": "0.13.22",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-coverage": "1.0.0",
+    "karma-jasmine": "1.0.2",
+    "karma-jasmine-html-reporter": "0.2.0",
+    "karma-mocha-reporter": "2.0.3",
+    "license-check": "1.1.5",
+    "remap-istanbul": "0.6.3",
+    "traceur": "0.0.91",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4",
+    "wsrv": "0.1.3"
   },
   "license-check-config": {
     "src": [
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json
index b3b7ccbdbf..b2839dc96d 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json
@@ -18,35 +18,38 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-      "@angular/common": "2.0.0-rc.2",
-      "@angular/compiler": "2.0.0-rc.2",
-      "@angular/core": "2.0.0-rc.2",
-      "@angular/http": "2.0.0-rc.2",
-      "@angular/platform-browser": "2.0.0-rc.2",
-      "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-      "@angular/router": "2.0.0-rc.2",
+      "@angular/common": "2.0.0-rc.3",
+      "@angular/compiler": "2.0.0-rc.3",
+      "@angular/core": "2.0.0-rc.3",
+      "@angular/forms": "0.1.1",
+      "@angular/http": "2.0.0-rc.3",
+      "@angular/platform-browser": "2.0.0-rc.3",
+      "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+      "@angular/router": "3.0.0-alpha.7",
       "@angular/router-deprecated": "2.0.0-rc.2",
-      "@angular/upgrade": "2.0.0-rc.2",
+      "@angular/upgrade": "2.0.0-rc.3",
       "systemjs": "0.19.27",
-      "core-js": "^2.4.0",
-      "reflect-metadata": "^0.1.3",
+      "core-js": "2.4.0",
+      "reflect-metadata": "0.1.3",
       "rxjs": "5.0.0-beta.6",
-      "zone.js": "^0.6.12",
-      "angular2-in-memory-web-api": "0.0.12",
-      "material-design-icons": "^2.2.3",
-      "material-design-lite": "^1.1.3",
-      "ng2-alfresco-documentlist": "^0.1.16",
-      "alfresco-js-api": "^0.1.0",
-      "ng2-translate": "2.2.0",
-      "rimraf": "^2.5.2"
+      "zone.js": "0.6.12",
+
+      "rimraf": "2.5.2",
+      "material-design-icons": "2.2.3",
+      "material-design-lite": "1.1.3",
+      "ng2-translate": "2.2.2",
+
+      "alfresco-js-api": "0.1.0",
+      "ng2-alfresco-core": "0.1.36",
+      "ng2-alfresco-documentlist": "0.1.34"
     },
     "devDependencies": {
-      "browser-sync": "^2.10.0",
-      "connect-history-api-fallback": "^1.2.0",
-      "concurrently": "^2.0.0",
-      "tslint": "^3.8.1",
-      "typescript": "^1.8.10",
-      "typings": "^1.0.4"
+      "browser-sync": "2.10.0",
+      "connect-history-api-fallback": "1.2.0",
+      "concurrently": "2.0.0",
+      "tslint": "3.8.1",
+      "typescript": "1.8.10",
+      "typings": "1.0.4"
     },
     "keywords": [
         "angular2",
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index 89ce0ed739..bf9be0469f 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng2-alfresco-documentlist",
   "description": "Alfresco Angular2 Document List Component",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "clean": "rimraf dist node_modules typings",
@@ -57,44 +57,48 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
-    "ng2-alfresco-core": "^0.1.0",
-    "alfresco-js-api": "^0.1.0",
-    "ng2-translate": "2.2.0",
-    "rimraf": "^2.5.2"
+    "zone.js": "0.6.12",
+    "rimraf": "2.5.2",
+    "ng2-translate": "2.2.2",
+    "ng2-alfresco-core": "0.1.35",
+    "alfresco-js-api": "0.1.0"
+  },
+  "peerDependencies": {
+    "material-design-icons": "^2.2.3",
+    "material-design-lite": "^1.1.3"
   },
   "devDependencies": {
-    "concurrently": "^2.1.0",
-    "coveralls": "^2.11.9",
-    "cpx": "^1.3.1",
+    "concurrently": "2.1.0",
+    "coveralls": "2.11.9",
+    "cpx": "1.3.1",
     "http-server": "0.8.5",
     "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-mocha-reporter": "^2.0.3",
-    "karma-jasmine-html-reporter": "^0.2.0",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "karma": "0.13.22",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-coverage": "1.0.0",
+    "karma-jasmine": "1.0.2",
+    "karma-mocha-reporter": "2.0.3",
+    "karma-jasmine-html-reporter": "0.2.0",
+    "license-check": "1.1.5",
+    "remap-istanbul": "0.6.3",
+    "traceur": "0.0.91",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4"
   },
   "license-check-config": {
     "src": [
diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json
index 6f6dc69618..15eae1d3b0 100644
--- a/ng2-components/ng2-alfresco-login/demo/package.json
+++ b/ng2-components/ng2-alfresco-login/demo/package.json
@@ -46,29 +46,30 @@
         "alfresco"
     ],
     "dependencies": {
-      "@angular/common": "2.0.0-rc.2",
-      "@angular/compiler": "2.0.0-rc.2",
-      "@angular/core": "2.0.0-rc.2",
-      "@angular/http": "2.0.0-rc.2",
-      "@angular/platform-browser": "2.0.0-rc.2",
-      "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-      "@angular/router": "2.0.0-rc.2",
+      "@angular/common": "2.0.0-rc.3",
+      "@angular/compiler": "2.0.0-rc.3",
+      "@angular/core": "2.0.0-rc.3",
+      "@angular/forms": "0.1.1",
+      "@angular/http": "2.0.0-rc.3",
+      "@angular/platform-browser": "2.0.0-rc.3",
+      "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+      "@angular/router": "3.0.0-alpha.7",
       "@angular/router-deprecated": "2.0.0-rc.2",
-      "@angular/upgrade": "2.0.0-rc.2",
+      "@angular/upgrade": "2.0.0-rc.3",
       "systemjs": "0.19.27",
-      "core-js": "^2.4.0",
-      "reflect-metadata": "^0.1.3",
+      "core-js": "2.4.0",
+      "reflect-metadata": "0.1.3",
       "rxjs": "5.0.0-beta.6",
-      "zone.js": "^0.6.12",
-      "angular2-in-memory-web-api": "0.0.12",
+      "zone.js": "0.6.12",
 
-      "material-design-icons": "^2.2.3",
-      "material-design-lite": "^1.1.3",
-      "alfresco-js-api": "^0.1.0",
-      "ng2-alfresco-core": "^0.1.0",
-      "ng2-alfresco-login": "^0.1.0",
-      "ng2-translate": "2.2.0",
-      "rimraf": "^2.5.2"
+      "rimraf": "2.5.2",
+      "material-design-icons": "2.2.3",
+      "material-design-lite": "1.1.3",
+      "ng2-translate": "2.2.2",
+
+      "alfresco-js-api": "0.1.0",
+      "ng2-alfresco-core": "0.1.36",
+      "ng2-alfresco-login": "0.1.29"
     },
     "devDependencies": {
       "browser-sync": "^2.10.0",
diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json
index bd49b6bb73..98e2e05f0b 100644
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng2-alfresco-login",
   "description": "Alfresco Angular2 Login Component",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "clean": "rimraf dist node_modules typings",
@@ -65,46 +65,46 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
-    "ng2-alfresco-core": "^0.1.0",
-    "alfresco-js-api": "^0.1.0",
-    "ng2-translate": "2.2.0",
-    "rimraf": "^2.5.2"
+    "zone.js": "0.6.12",
+    "rimraf": "2.5.2",
+    "ng2-translate": "2.2.2",
+    "ng2-alfresco-core": "0.1.35",
+    "alfresco-js-api": "0.1.0"
   },
   "devDependencies": {
-    "concurrently": "^2.1.0",
-    "coveralls": "^2.11.9",
-    "cpx": "^1.3.1",
+    "concurrently": "2.1.0",
+    "coveralls": "2.11.9",
+    "cpx": "1.3.1",
     "http-server": "0.8.5",
     "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-mocha-reporter": "^2.0.3",
-    "karma-jasmine-html-reporter": "^0.2.0",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4",
-    "xo": "^0.14.0",
-    "yargs": "^4.7.0"
+    "karma": "0.13.22",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-coverage": "1.0.0",
+    "karma-jasmine": "1.0.2",
+    "karma-mocha-reporter": "2.0.3",
+    "karma-jasmine-html-reporter": "0.2.0",
+    "license-check": "1.1.5",
+    "remap-istanbul": "0.6.3",
+    "traceur": "0.0.91",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4",
+    "xo": "0.14.0",
+    "yargs": "4.7.0"
   },
   "license-check-config": {
     "src": [
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
index 05a8efd815..541f38e262 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
@@ -89,6 +89,24 @@ describe('AlfrescoLogin', () => {
         expect(element.querySelector('input[type="text"]').value).toEqual('');
     });
 
+    it('should render validation min-length error when the username is just 1 character', () => {
+        let compiled = componentFixture.debugElement.nativeElement;
+        let usernameInput = compiled.querySelector('#username');
+
+        componentFixture.detectChanges();
+
+        usernameInput.value = '1';
+        usernameInput.dispatchEvent(new Event('input'));
+
+        componentFixture.detectChanges();
+
+        expect(component.formError).toBeDefined();
+        expect(component.formError.username).toBeDefined();
+        expect(component.formError.username).toEqual('LOGIN.MESSAGES.USERNAME-MIN');
+        expect(compiled.querySelector('#username-error')).toBeDefined();
+        expect(compiled.querySelector('#username-error').innerText).toEqual('LOGIN.MESSAGES.USERNAME-MIN');
+    });
+
     it('should render validation min-length error when the username is lower than 4 characters', () => {
         let compiled = componentFixture.debugElement.nativeElement;
         let usernameInput = compiled.querySelector('#username');
@@ -100,10 +118,6 @@ describe('AlfrescoLogin', () => {
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
-
-        componentFixture.detectChanges();
-
         expect(component.formError).toBeDefined();
         expect(component.formError.username).toBeDefined();
         expect(component.formError.username).toEqual('LOGIN.MESSAGES.USERNAME-MIN');
@@ -111,21 +125,18 @@ describe('AlfrescoLogin', () => {
         expect(compiled.querySelector('#username-error').innerText).toEqual('LOGIN.MESSAGES.USERNAME-MIN');
     });
 
-    it('should render validation required error when the username is empty', () => {
+    it('should render validation required error when the username is empty and dirty', () => {
         let compiled = componentFixture.debugElement.nativeElement;
         let usernameInput = compiled.querySelector('#username');
 
         componentFixture.detectChanges();
 
         usernameInput.value = '';
+        component.form.controls.username.markAsDirty();
         usernameInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
-
-        componentFixture.detectChanges();
-
         expect(component.formError).toBeDefined();
         expect(component.formError.username).toBeDefined();
         expect(component.formError.username).toEqual('LOGIN.MESSAGES.USERNAME-REQUIRED');
@@ -133,21 +144,18 @@ describe('AlfrescoLogin', () => {
         expect(compiled.querySelector('#username-error').innerText).toEqual('LOGIN.MESSAGES.USERNAME-REQUIRED');
     });
 
-    it('should render validation required error when the password is empty', () => {
+    it('should render validation required error when the password is empty and dirty', () => {
         let compiled = componentFixture.debugElement.nativeElement;
         let passwordInput = compiled.querySelector('#password');
 
         componentFixture.detectChanges();
 
         passwordInput.value = '';
+        component.form.controls.password.markAsDirty();
         passwordInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
-
-        componentFixture.detectChanges();
-
         expect(component.formError).toBeDefined();
         expect(component.formError.password).toBeDefined();
         expect(component.formError.password).toEqual('LOGIN.MESSAGES.PASSWORD-REQUIRED');
@@ -164,15 +172,15 @@ describe('AlfrescoLogin', () => {
 
         usernameInput.value = 'fake-username';
         passwordInput.value = 'fake-password';
+
+        component.form.controls.username.markAsDirty();
+        component.form.controls.password.markAsDirty();
+
         usernameInput.dispatchEvent(new Event('input'));
         passwordInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
-
-        componentFixture.detectChanges();
-
         expect(component.formError).toBeDefined();
         expect(component.formError.username).toEqual('');
         expect(component.formError.password).toEqual('');
@@ -189,15 +197,15 @@ describe('AlfrescoLogin', () => {
 
         usernameInput.value = 'fake-change-username';
         passwordInput.value = 'fake-change-password';
+
+        component.form.controls.username.markAsDirty();
+        component.form.controls.password.markAsDirty();
+
         usernameInput.dispatchEvent(new Event('input'));
         passwordInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
-
-        componentFixture.detectChanges();
-
         expect(compiled.querySelector('input[type="text"]').value).toEqual('fake-change-username');
         expect(compiled.querySelector('input[type="password"]').value).toEqual('fake-change-password');
     });
@@ -214,12 +222,12 @@ describe('AlfrescoLogin', () => {
 
         usernameInput.value = 'fake-username';
         passwordInput.value = 'fake-password';
+
         usernameInput.dispatchEvent(new Event('input'));
         passwordInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
         compiled.querySelector('button').click();
 
         componentFixture.detectChanges();
@@ -240,12 +248,12 @@ describe('AlfrescoLogin', () => {
 
         usernameInput.value = 'fake-wrong-username';
         passwordInput.value = 'fake-password';
+
         usernameInput.dispatchEvent(new Event('input'));
         passwordInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
         compiled.querySelector('button').click();
 
         componentFixture.detectChanges();
@@ -268,12 +276,12 @@ describe('AlfrescoLogin', () => {
 
         usernameInput.value = 'fake-username';
         passwordInput.value = 'fake-wrong-password';
+
         usernameInput.dispatchEvent(new Event('input'));
         passwordInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
         compiled.querySelector('button').click();
 
         componentFixture.detectChanges();
@@ -296,12 +304,12 @@ describe('AlfrescoLogin', () => {
 
         usernameInput.value = 'fake-wrong-username';
         passwordInput.value = 'fake-wrong-password';
+
         usernameInput.dispatchEvent(new Event('input'));
         passwordInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
         compiled.querySelector('button').click();
 
         componentFixture.detectChanges();
@@ -326,12 +334,12 @@ describe('AlfrescoLogin', () => {
 
         usernameInput.value = 'fake-username';
         passwordInput.value = 'fake-password';
+
         usernameInput.dispatchEvent(new Event('input'));
         passwordInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
         compiled.querySelector('button').click();
 
         componentFixture.detectChanges();
@@ -357,12 +365,12 @@ describe('AlfrescoLogin', () => {
 
         usernameInput.value = 'fake-username';
         passwordInput.value = 'fake-wrong-password';
+
         usernameInput.dispatchEvent(new Event('input'));
         passwordInput.dispatchEvent(new Event('input'));
 
         componentFixture.detectChanges();
 
-        component.onValueChanged(null);
         compiled.querySelector('button').click();
 
         componentFixture.detectChanges();
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
index 5a9208e2de..9da606108c 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
@@ -131,7 +131,7 @@ export class AlfrescoLoginComponent {
         for (let field in this.formError) {
             if (field) {
                 this.formError[field] = '';
-                let hasError = (this.form.controls[field].errors && !this.form.controls[field].pristine) ||
+                let hasError = (this.form.controls[field].errors && data[field] !== '') ||
                     (this.form.controls[field].dirty && !this.form.controls[field].valid);
                 if (hasError) {
                     for (let key in this.form.controls[field].errors) {
diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json
index e311e08c7d..9efe5e82a9 100644
--- a/ng2-components/ng2-alfresco-search/demo/package.json
+++ b/ng2-components/ng2-alfresco-search/demo/package.json
@@ -46,37 +46,38 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
+    "zone.js": "0.6.12",
 
-    "material-design-icons": "^2.2.3",
-    "material-design-lite": "^1.1.3",
-    "ng2-translate": "2.2.0",
-    "alfresco-js-api": "^0.1.0",
-    "ng2-alfresco-core": "^0.1.0",
-    "ng2-alfresco-search": "^0.1.12",
-    "rimraf": "^2.5.2"
+    "rimraf": "2.5.2",
+    "ng2-translate": "2.2.2",
+    "material-design-icons": "2.2.3",
+    "material-design-lite": "1.1.3",
+
+    "alfresco-js-api": "0.1.0",
+    "ng2-alfresco-core": "0.1.36",
+    "ng2-alfresco-search": "0.1.21"
   },
   "devDependencies": {
-    "browser-sync": "^2.10.0",
-    "connect-history-api-fallback": "^1.2.0",
-    "concurrently": "^2.0.0",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "browser-sync": "2.10.0",
+    "connect-history-api-fallback": "1.2.0",
+    "concurrently": "2.0.0",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4"
   },
   "publishConfig": {
     "registry": "http://devproducts.alfresco.me:4873/"
diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json
index 35f6aefb82..590ff2c825 100644
--- a/ng2-components/ng2-alfresco-search/package.json
+++ b/ng2-components/ng2-alfresco-search/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng2-alfresco-search",
   "description": "Alfresco Angular2 Search Component",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "clean": "rimraf dist node_modules typings",
@@ -44,6 +44,10 @@
     {
       "name": "Will Abson",
       "email": "will.abson@alfresco.com"
+    },
+    {
+      "name": "Denys Vuika",
+      "email": "denys.vuika@alfresco.com"
     }
   ],
   "keywords": [
@@ -53,45 +57,49 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
-    "alfresco-js-api": "^0.1.0",
-    "ng2-alfresco-core": "^0.1.25",
-    "ng2-translate": "2.2.0",
-    "rimraf": "^2.5.2",
+    "zone.js": "0.6.12",
+    "rimraf": "2.5.2",
+    "ng2-translate": "2.2.2",
+    "material-design-lite": "1.1.3",
+    "alfresco-js-api": "0.1.0",
+    "ng2-alfresco-core": "0.1.35"
+  },
+  "peerDependencies": {
+    "material-design-icons": "^2.2.3",
     "material-design-lite": "^1.1.3"
   },
   "devDependencies": {
-    "concurrently": "^2.1.0",
-    "coveralls": "^2.11.9",
-    "cpx": "^1.3.1",
+    "concurrently": "2.1.0",
+    "coveralls": "2.11.9",
+    "cpx": "1.3.1",
     "http-server": "0.8.5",
     "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-mocha-reporter": "^2.0.3",
-    "karma-jasmine-html-reporter": "^0.2.0",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "karma": "0.13.22",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-coverage": "1.0.0",
+    "karma-jasmine": "1.0.2",
+    "karma-mocha-reporter": "2.0.3",
+    "karma-jasmine-html-reporter": "0.2.0",
+    "license-check": "1.1.5",
+    "remap-istanbul": "0.6.3",
+    "traceur": "0.0.91",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4"
   },
   "license-check-config": {
     "src": [
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
index 42797d84a7..622d0678ea 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
@@ -19,7 +19,7 @@
     </thead>
     <tbody>
 
-    <tr *ngFor="let result of results; let idx = index">
+    <tr *ngFor="let result of results; let idx = index" (click)="onItemClick(result, $event)">
         <td><img src="{{getMimeTypeIcon(result)}}" /></td>
         <td attr.data-automation-id=file_{{result.entry.name}} >{{result.entry.name}}</td>
         <td attr.data-automation-id=file_{{result.entry.name}}_{{result.entry.modifiedByUser.displayName}}>
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
index 8486802bd1..7699fab4cf 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
@@ -109,4 +109,35 @@ describe('AlfrescoSearchComponent', () => {
 
     });
 
+    describe('search result actions', () => {
+
+        it('should emit preview when file item clicked',
+            inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+                return tcb
+                    .overrideProviders(AlfrescoSearchComponent, [
+                        { provide: AlfrescoSearchService, useClass: SearchServiceMock }
+                    ])
+                    .createAsync(AlfrescoSearchComponent)
+                    .then((fixture) => {
+                        let componentInstance = fixture.componentInstance;
+                        componentInstance.results = [{
+                            entry: {
+                                id: '123',
+                                name: 'MyDoc',
+                                content: {
+                                    mimetype: 'text/plain'
+                                },
+                                isFile: true
+                            }
+                        }];
+                        fixture.detectChanges(componentInstance.results[0]);
+                        componentInstance.preview.subscribe(e => {
+                            expect(e.value).toBe(componentInstance.results[0]);
+                        });
+                        componentInstance.onItemClick();
+
+                    });
+            }));
+    });
+
 });
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
index 28ba3a2831..2c81a0ffbc 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Component, Input, Optional, OnChanges, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, Output, Optional, OnChanges, OnInit } from '@angular/core';
 import { RouteParams } from '@angular/router-deprecated';
 import { AlfrescoSearchService } from './../services/alfresco-search.service';
 import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service';
@@ -38,6 +38,9 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
     @Input()
     searchTerm: string = '';
 
+    @Output()
+    preview: EventEmitter<any> = new EventEmitter();
+
     results: any;
 
     errorMessage;
@@ -100,4 +103,17 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
         }
     }
 
+    onItemClick(node, event?: Event): void {
+        if (event) {
+            event.preventDefault();
+        }
+        if (node && node.entry) {
+            if (node.entry.isFile) {
+                this.preview.emit({
+                    value: node
+                });
+            }
+        }
+    }
+
 }
diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
index c06f58ca69..2e09bd5b6f 100644
--- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
+++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
@@ -59,7 +59,6 @@ export class AlfrescoSearchService {
     public getLiveSearchResults(term: string): Observable<any> {
         return Observable.fromPromise(this.getSearchNodesPromise(term))
             .map(res => <any> res)
-            .do(data => console.log('Search data', data)) // eyeball results in the console
             .catch(this.handleError);
     }
 
diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json
index 8ab9c5dee1..b186d2c83e 100644
--- a/ng2-components/ng2-alfresco-upload/demo/package.json
+++ b/ng2-components/ng2-alfresco-upload/demo/package.json
@@ -46,37 +46,38 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
+    "zone.js": "0.6.12",
 
-    "material-design-icons": "^2.2.3",
-    "material-design-lite": "^1.1.3",
-    "alfresco-js-api": "^0.1.0",
-    "ng2-alfresco-core": "^0.1.0",
-    "ng2-translate": "2.2.0",
-    "ng2-alfresco-upload": "^0.1.0",
-    "rimraf": "^2.5.2"
+    "rimraf": "2.5.2",
+    "ng2-translate": "2.2.2",
+    "material-design-icons": "2.2.3",
+    "material-design-lite": "1.1.3",
+
+    "alfresco-js-api": "0.1.0",
+    "ng2-alfresco-core": "0.1.36",
+    "ng2-alfresco-upload": "0.1.49"
   },
   "devDependencies": {
-    "browser-sync": "^2.10.0",
-    "connect-history-api-fallback": "^1.2.0",
-    "concurrently": "^2.0.0",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "browser-sync": "2.10.0",
+    "connect-history-api-fallback": "1.2.0",
+    "concurrently": "2.0.0",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4"
   },
   "publishConfig": {
     "registry": "http://devproducts.alfresco.me:4873/"
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index 69858e9d6e..00626577dd 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng2-alfresco-upload",
   "description": "Alfresco Angular2 Upload Component",
-  "version": "0.1.48",
+  "version": "0.1.49",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "clean": "rimraf dist node_modules typings",
@@ -60,46 +60,50 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
-    "alfresco-js-api": "^0.1.0",
-    "ng2-alfresco-core": "^0.1.0",
-    "ng2-translate": "2.2.0",
-    "rimraf": "^2.5.2"
+    "zone.js": "0.6.12",
+    "rimraf": "2.5.2",
+    "ng2-translate": "2.2.2",
+    "alfresco-js-api": "0.1.0",
+    "ng2-alfresco-core": "0.1.35"
+  },
+  "peerDependencies": {
+    "material-design-icons": "^2.2.3",
+    "material-design-lite": "^1.1.3"
   },
   "devDependencies": {
-    "concurrently": "^2.1.0",
-    "coveralls": "^2.11.9",
-    "cpx": "^1.3.1",
+    "concurrently": "2.1.0",
+    "coveralls": "2.11.9",
+    "cpx": "1.3.1",
     "http-server": "0.8.5",
-    "jasmine-ajax": "^3.2.0",
+    "jasmine-ajax": "3.2.0",
     "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-jasmine-ajax": "^0.1.13",
-    "karma-jasmine-html-reporter": "^0.2.0",
-    "karma-mocha-reporter": "^2.0.3",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "karma": "0.13.22",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-coverage": "1.0.0",
+    "karma-jasmine": "1.0.2",
+    "karma-jasmine-ajax": "0.1.13",
+    "karma-jasmine-html-reporter": "0.2.0",
+    "karma-mocha-reporter": "2.0.3",
+    "license-check": "1.1.5",
+    "remap-istanbul": "0.6.3",
+    "traceur": "0.0.91",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4"
   },
   "license-check-config": {
     "src": [
diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json
index 804af452c7..402a6082bc 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/package.json
+++ b/ng2-components/ng2-alfresco-viewer/demo/package.json
@@ -18,33 +18,36 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
-    "ng2-alfresco-viewer": "file:../",
-    "material-design-icons": "^2.2.3",
-    "material-design-lite": "^1.1.3",
-    "rimraf": "^2.5.2"
+    "zone.js": "0.6.12",
+
+    "rimraf": "2.5.2",
+    "material-design-icons": "2.2.3",
+    "material-design-lite": "1.1.3",
+    "pdfjs-dist": "1.5.258",
+
+    "ng2-alfresco-viewer": "0.1.32"
   },
   "devDependencies": {
-    "browser-sync": "^2.10.0",
-    "connect-history-api-fallback": "^1.2.0",
-    "concurrently": "^2.0.0",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "browser-sync": "2.10.0",
+    "connect-history-api-fallback": "1.2.0",
+    "concurrently": "2.0.0",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4"
   },
   "contributors": [
     {
@@ -58,6 +61,7 @@
   ],
   "keywords": [
     "angular2",
-    "typescript"
+    "typescript",
+    "alfresco"
   ]
 }
diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json
index 6f5c382e13..0c4897914a 100644
--- a/ng2-components/ng2-alfresco-viewer/package.json
+++ b/ng2-components/ng2-alfresco-viewer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng2-alfresco-viewer",
   "description": "Alfresco documents viewer",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "author": "Eugenio Romano",
   "scripts": {
     "clean": "rimraf dist node_modules typings",
@@ -54,44 +54,48 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
     "systemjs": "0.19.27",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "angular2-in-memory-web-api": "0.0.12",
-    "pdfjs-dist": "^1.5.258",
-    "rimraf": "^2.5.2"
+    "zone.js": "0.6.12",
+    "rimraf": "2.5.2",
+    "pdfjs-dist": "1.5.258"
+  },
+  "peerDependencies": {
+    "material-design-icons": "^2.2.3",
+    "material-design-lite": "^1.1.3"
   },
   "devDependencies": {
-    "concurrently": "^2.1.0",
-    "coveralls": "^2.11.9",
-    "cpx": "^1.3.1",
+    "concurrently": "2.1.0",
+    "coveralls": "2.11.9",
+    "cpx": "1.3.1",
     "http-server": "0.8.5",
-    "jasmine-ajax": "^3.2.0",
+    "jasmine-ajax": "3.2.0",
     "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-jasmine-ajax": "^0.1.13",
-    "karma-jasmine-html-reporter": "^0.2.0",
-    "karma-mocha-reporter": "^2.0.3",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "karma": "0.13.22",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-coverage": "1.0.0",
+    "karma-jasmine": "1.0.2",
+    "karma-jasmine-ajax": "0.1.13",
+    "karma-jasmine-html-reporter": "0.2.0",
+    "karma-mocha-reporter": "2.0.3",
+    "license-check": "1.1.5",
+    "remap-istanbul": "0.6.3",
+    "traceur": "0.0.91",
+    "tslint": "3.8.1",
+    "typescript": "1.8.10",
+    "typings": "1.0.4"
   },
   "license-check-config": {
     "src": [