diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html
index f8b6e7e7ab..94b9382036 100644
--- a/demo-shell-ng2/app/components/files/files.component.html
+++ b/demo-shell-ng2/app/components/files/files.component.html
@@ -35,6 +35,15 @@
                     </template>
                     -->
                 </content-column>
+                <content-column
+                    title="{{'DOCUMENT_LIST.COLUMNS.TAG' | translate}}"
+                    key="id"
+                    sortable="true"
+                    class="full-width ellipsis-cell">
+                    <template let-entry="$implicit">
+                        <alfresco-tag-node-list  [nodeId]="entry.data.getValue(entry.row, entry.col)"></alfresco-tag-node-list>
+                    </template>
+                </content-column>
                 <content-column
                         title="{{'DOCUMENT_LIST.COLUMNS.CREATED_BY' | translate}}"
                         key="createdByUser.displayName"
diff --git a/demo-shell-ng2/custom-translation/i18n/en.json b/demo-shell-ng2/custom-translation/i18n/en.json
index b35c62c63a..9a2c5c5f89 100644
--- a/demo-shell-ng2/custom-translation/i18n/en.json
+++ b/demo-shell-ng2/custom-translation/i18n/en.json
@@ -4,6 +4,7 @@
     "DOCUMENT_LIST": {
         "COLUMNS": {
             "DISPLAY_NAME": "Display name",
+            "TAG": "Tag",
             "CREATED_BY": "Created by",
             "CREATED_ON": "Created on"
         },
diff --git a/demo-shell-ng2/custom-translation/i18n/it.json b/demo-shell-ng2/custom-translation/i18n/it.json
index bd5e5efc77..54e1803b74 100644
--- a/demo-shell-ng2/custom-translation/i18n/it.json
+++ b/demo-shell-ng2/custom-translation/i18n/it.json
@@ -4,6 +4,7 @@
   "DOCUMENT_LIST": {
     "COLUMNS": {
       "DISPLAY_NAME": "Mostra name",
+      "TAG": "Tag",
       "CREATED_BY": "Creato da",
       "CREATED_ON": "Creato il"
     },
diff --git a/ng2-components/ng2-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md
index 8153a8cce0..cdb03f2058 100644
--- a/ng2-components/ng2-activiti-tasklist/README.md
+++ b/ng2-components/ng2-activiti-tasklist/README.md
@@ -265,7 +265,7 @@ This can be changed by adding the following custom html template:
 The component shows all the available apps.
 
 ```html
-<activiti-apps [layoutType]="'GRID'"></activiti-filters>
+<activiti-apps [layoutType]="'GRID'"></activiti-apps>
 ```
 
 #### Events
diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md
index bb13408c71..ce6e74aff3 100644
--- a/ng2-components/ng2-alfresco-documentlist/README.md
+++ b/ng2-components/ng2-alfresco-documentlist/README.md
@@ -501,7 +501,7 @@ _You may want using **row** api to get raw value access.
 
 Use **data** api to get values with post-processing, like datetime/icon conversion._
 
-Final example, we'll name the context as `entry`:
+In the Example below will prepend `Hi!` to each file and folder name in the list: 
 
 ```html
 <content-column title="Name" key="name" sortable="true" class="full-width ellipsis-cell">
@@ -511,9 +511,21 @@ Final example, we'll name the context as `entry`:
 </content-column>
 ```
 
-Example above will prepend `Hi!` to each file and folder name in the list.
+In the Example below will add the [ng2-alfresco-tag](https://www.npmjs.com/package/ng2-alfresco-tag) component is integrate in the document list.
 
+```html
+<content-column
+    title="{{'DOCUMENT_LIST.COLUMNS.TAG' | translate}}"
+    key="id"
+    sortable="true"
+    class="full-width ellipsis-cell">
+    <template let-entry="$implicit">
+        <alfresco-tag-node-list  [nodeId]="entry.data.getValue(entry.row, entry.col)"></alfresco-tag-node-list>
+    </template>
+</content-column>
+```
 
+![Tag component in document List](docs/assets/document-list-tag-template.png)
 
 ### Actions
 
diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-tag-template.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-tag-template.png
new file mode 100644
index 0000000000..769147a677
Binary files /dev/null and b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-tag-template.png differ