diff --git a/BUILD.md b/BUILD.md
index e2ea1f6f..69bf6fce 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -2,7 +2,7 @@
 
 The project includes three components:
 
-- [**_annotation-app_**](./annotation-app): Angular application built with [Angular 8.x](https://angular.io/guide/router-tutorial)
+- [**_annotation-app_**](./annotation-app): Angular application built with [Angular v11](https://angular.io/docs)
 - [**_annotation-service_**](./annotation-service): Backend services built with [Node](https://nodejs.org/en/), [mongodb](https://www.mongodb.com/download-center/community), [express](https://www.npmjs.com/package/express)
 - [**_active-learning-service_**](./active-learning-service): Django application providing active learning api built with [Python](https://www.python.org/downloads/) and [Django](https://www.djangoproject.com/) and [modAL](https://modal-python.readthedocs.io/en/latest/#) library for pool-based uncertainty sampling to rank the unlabelled data
 
diff --git a/annotation-app/Dockerfile b/annotation-app/Dockerfile
index 7625c179..baa42670 100644
--- a/annotation-app/Dockerfile
+++ b/annotation-app/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 VMware, Inc.
+# Copyright 2019-2022 VMware, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 ### STAGE 1: Build ###
diff --git a/annotation-app/docker-entrypoint.sh b/annotation-app/docker-entrypoint.sh
index 804b92c3..34f6f6af 100644
--- a/annotation-app/docker-entrypoint.sh
+++ b/annotation-app/docker-entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2019-2021 VMware, Inc.
+# Copyright 2019-2022 VMware, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 ## Substitutes env variables in main.*.js bundle
diff --git a/annotation-app/package-lock.json b/annotation-app/package-lock.json
index ed39b945..1a83b364 100644
--- a/annotation-app/package-lock.json
+++ b/annotation-app/package-lock.json
@@ -34,7 +34,7 @@
         "lodash": "4.17.21",
         "marked": "2.1.3",
         "mutationobserver-shim": "0.3.2",
-        "ngx-papaparse": "^5.1.0",
+        "ngx-papaparse": "~5.1.0",
         "pako": "~2.0.3",
         "rxjs": "6.6.7",
         "tslib": "^2.0.0",
diff --git a/annotation-app/src/app/app.component.html b/annotation-app/src/app/app.component.html
index 954d3518..1e90acf4 100644
--- a/annotation-app/src/app/app.component.html
+++ b/annotation-app/src/app/app.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <clr-main-container>
diff --git a/annotation-app/src/app/app.component.scss b/annotation-app/src/app/app.component.scss
index d85f74f5..7cf53622 100644
--- a/annotation-app/src/app/app.component.scss
+++ b/annotation-app/src/app/app.component.scss
@@ -1,4 +1,4 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
diff --git a/annotation-app/src/app/app.component.ts b/annotation-app/src/app/app.component.ts
index bc181956..4ba00382 100644
--- a/annotation-app/src/app/app.component.ts
+++ b/annotation-app/src/app/app.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/app.module.ts b/annotation-app/src/app/app.module.ts
index df57cab0..7b337e94 100644
--- a/annotation-app/src/app/app.module.ts
+++ b/annotation-app/src/app/app.module.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/app.routing.ts b/annotation-app/src/app/app.routing.ts
index baeb9bfe..e1bbcd37 100644
--- a/annotation-app/src/app/app.routing.ts
+++ b/annotation-app/src/app/app.routing.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/admin/admin.component.html b/annotation-app/src/app/components/admin/admin.component.html
index 26ebe6d6..11de0be2 100644
--- a/annotation-app/src/app/components/admin/admin.component.html
+++ b/annotation-app/src/app/components/admin/admin.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="container mainArea">
diff --git a/annotation-app/src/app/components/admin/admin.component.scss b/annotation-app/src/app/components/admin/admin.component.scss
index da1016f4..40f01fda 100644
--- a/annotation-app/src/app/components/admin/admin.component.scss
+++ b/annotation-app/src/app/components/admin/admin.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/admin/admin.component.ts b/annotation-app/src/app/components/admin/admin.component.ts
index cefa81ab..16c4d903 100644
--- a/annotation-app/src/app/components/admin/admin.component.ts
+++ b/annotation-app/src/app/components/admin/admin.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -350,7 +350,7 @@ export class AdminComponent implements OnInit {
             generateDoneTime: res.updateTime,
             format: res.format,
             downloadUrl: this.env.config.enableAWSS3
-              ? new Buffer(res.file, 'base64').toString()
+              ? Buffer.from(res.file, 'base64').toString()
               : res.file,
             datasets: this.datasets,
             id: e.id,
@@ -542,7 +542,7 @@ export class AdminComponent implements OnInit {
         this.infoMessage =
           'Dataset with annotations is already been generated. Please refresh the page.';
         this.downloadUrl = this.env.config.enableAWSS3
-          ? new Buffer(e.Body.file, 'base64').toString()
+          ? Buffer.from(e.Body.file, 'base64').toString()
           : e.Body.file;
         this.downloadProject();
         this.getProjects();
diff --git a/annotation-app/src/app/components/authentication/authentication.component.html b/annotation-app/src/app/components/authentication/authentication.component.html
index 95bb7cf6..3cb3e9fc 100644
--- a/annotation-app/src/app/components/authentication/authentication.component.html
+++ b/annotation-app/src/app/components/authentication/authentication.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="spinner-container" style="text-align: center">
diff --git a/annotation-app/src/app/components/authentication/authentication.component.ts b/annotation-app/src/app/components/authentication/authentication.component.ts
index 0e0e9d10..7963ac20 100644
--- a/annotation-app/src/app/components/authentication/authentication.component.ts
+++ b/annotation-app/src/app/components/authentication/authentication.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.html b/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.html
index 5c99006d..6a3cb380 100644
--- a/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.html
+++ b/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="container mainArea">
diff --git a/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.scss b/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.scss
index fb056e85..e2e12ee1 100644
--- a/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.scss
+++ b/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.ts b/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.ts
index d3567fa8..29bc3df0 100644
--- a/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.ts
+++ b/annotation-app/src/app/components/datasets-sharing/datasets-sharing.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -137,7 +137,7 @@ export class DatasetsSharingComponent implements OnInit {
             latestAnnotationTime: e.updatedDate,
             generateDoneTime: res.updateTime,
             downloadUrl: this.env.config.enableAWSS3
-              ? new Buffer(res.file, 'base64').toString()
+              ? Buffer.from(res.file, 'base64').toString()
               : res.file,
             datasets: this.datasets,
             id: e.id,
@@ -187,7 +187,7 @@ export class DatasetsSharingComponent implements OnInit {
         this.infoMessage =
           'Dataset with annotations is already been generated. Please refresh the page.';
         this.downloadUrl = this.env.config.enableAWSS3
-          ? new Buffer(e.Body.file, 'base64').toString()
+          ? Buffer.from(e.Body.file, 'base64').toString()
           : e.Body.file;
         this.downloadProject();
         this.getProjects();
diff --git a/annotation-app/src/app/components/edit-project/edit-project.component.html b/annotation-app/src/app/components/edit-project/edit-project.component.html
index 55f7ba93..bcd9dcbb 100644
--- a/annotation-app/src/app/components/edit-project/edit-project.component.html
+++ b/annotation-app/src/app/components/edit-project/edit-project.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="modal">
@@ -484,6 +484,24 @@ <h3 class="modal-title">Edit Project</h3>
             </form>
           </div>
           <div>
+            <clr-tooltip *ngIf="inputLabelErrMsg">
+              <clr-icon
+                clrTooltipTrigger
+                shape="error-standard"
+                size="18"
+                style="color: red"
+                class="valid-tooltip"
+              >
+              </clr-icon>
+              <clr-tooltip-content
+                class="error-tooltip"
+                clrPosition="bottom-right"
+                clrSize="md"
+                *clrIfOpen
+              >
+                <span>{{inputLabelErrMsg}}</span>
+              </clr-tooltip-content>
+            </clr-tooltip>
             <clr-tooltip *ngIf="labelType === 'numericLabel' && isMultipleLabel && inputIsNull">
               <clr-icon
                 clrTooltipTrigger
diff --git a/annotation-app/src/app/components/edit-project/edit-project.component.scss b/annotation-app/src/app/components/edit-project/edit-project.component.scss
index 4e4f1aed..2ca92c15 100644
--- a/annotation-app/src/app/components/edit-project/edit-project.component.scss
+++ b/annotation-app/src/app/components/edit-project/edit-project.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/edit-project/edit-project.component.ts b/annotation-app/src/app/components/edit-project/edit-project.component.ts
index 89481f78..cf10af4c 100644
--- a/annotation-app/src/app/components/edit-project/edit-project.component.ts
+++ b/annotation-app/src/app/components/edit-project/edit-project.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -80,6 +80,7 @@ export class EditProjectComponent implements OnInit {
   inputSlackChannels: any = [];
   showLabel: boolean = true;
   isShowSlack: boolean = false;
+  inputLabelErrMsg: string;
 
   constructor(
     private avaService: AvaService,
@@ -164,7 +165,7 @@ export class EditProjectComponent implements OnInit {
         this.categoryList.push(flag);
       });
     }
-    if (this.msg.assignSlackChannels.length > 0) {
+    if (this.msg.assignSlackChannels && this.msg.assignSlackChannels.length > 0) {
       this.slackList = this.msg.assignSlackChannels;
       this.msg.assignSlackChannels.forEach((element) => {
         this.inputSlackChannels.push(element.slackName);
@@ -541,8 +542,15 @@ export class EditProjectComponent implements OnInit {
   }
 
   onEnterLabel(e) {
-    if (e && this.inputLabelValidation == false) {
-      const flag = { status: 'new', originalLabel: e, editLabel: e };
+    // to check format comma
+    if (/[,，]/g.test(e.trim())) {
+      this.inputLabelErrMsg = 'Wrong format! Not allow comma.';
+      return;
+    } else {
+      this.inputLabelErrMsg = '';
+    }
+    if (e && this.inputLabelValidation == false && !this.inputLabelErrMsg) {
+      const flag = { status: 'new', originalLabel: e.trim(), editLabel: e.trim() };
       this.categoryList.push(flag);
       this.inputNewLabel = null;
     }
@@ -554,7 +562,7 @@ export class EditProjectComponent implements OnInit {
 
   onLabelKeyUp(e) {
     for (let i = 0; i < this.categoryList.length; i++) {
-      if (this.categoryList[i].editLabel == e.target.value) {
+      if (this.categoryList[i].editLabel == e.target.value.trim()) {
         this.inputLabelValidation = true;
         return;
       } else {
@@ -578,9 +586,10 @@ export class EditProjectComponent implements OnInit {
       this.activeClickInput = null;
     }
 
-    if (e.editLabel == '' || this.inputLabelValidation == true) {
+    if (e.editLabel == '' || this.inputLabelValidation == true || this.inputLabelErrMsg) {
       this.activeClickInput = null;
       e.editLabel = e.originalLabel;
+      this.inputLabelErrMsg = '';
     }
   }
 
@@ -595,7 +604,7 @@ export class EditProjectComponent implements OnInit {
     });
     let i = 0;
     flag.forEach((element) => {
-      if (element == e) {
+      if (element == e.trim()) {
         i = i + 1;
       }
     });
@@ -604,6 +613,13 @@ export class EditProjectComponent implements OnInit {
     } else {
       this.inputLabelValidation = false;
     }
+    // to check format comma
+    if (/[,，]/g.test(e.trim())) {
+      this.inputLabelErrMsg = 'Wrong format! Not allow comma.';
+      return;
+    } else {
+      this.inputLabelErrMsg = '';
+    }
   }
 
   minUpdate(e) {
diff --git a/annotation-app/src/app/components/faq/faq.component.html b/annotation-app/src/app/components/faq/faq.component.html
index 2d6d5920..1f08ed1e 100644
--- a/annotation-app/src/app/components/faq/faq.component.html
+++ b/annotation-app/src/app/components/faq/faq.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="clr-row">
diff --git a/annotation-app/src/app/components/faq/faq.component.scss b/annotation-app/src/app/components/faq/faq.component.scss
index 5d971ab8..ed421ff0 100644
--- a/annotation-app/src/app/components/faq/faq.component.scss
+++ b/annotation-app/src/app/components/faq/faq.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/faq/faq.component.ts b/annotation-app/src/app/components/faq/faq.component.ts
index 07c18157..4809d413 100644
--- a/annotation-app/src/app/components/faq/faq.component.ts
+++ b/annotation-app/src/app/components/faq/faq.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/footer/footer.component.html b/annotation-app/src/app/components/footer/footer.component.html
index 84d63607..7d38a41e 100644
--- a/annotation-app/src/app/components/footer/footer.component.html
+++ b/annotation-app/src/app/components/footer/footer.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="footer">
diff --git a/annotation-app/src/app/components/footer/footer.component.scss b/annotation-app/src/app/components/footer/footer.component.scss
index 83bbc9ea..11028ed5 100644
--- a/annotation-app/src/app/components/footer/footer.component.scss
+++ b/annotation-app/src/app/components/footer/footer.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/footer/footer.component.ts b/annotation-app/src/app/components/footer/footer.component.ts
index 0ff46346..0a6d556e 100644
--- a/annotation-app/src/app/components/footer/footer.component.ts
+++ b/annotation-app/src/app/components/footer/footer.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/game-form/game-form.component.html b/annotation-app/src/app/components/game-form/game-form.component.html
index c6206152..bb378eea 100644
--- a/annotation-app/src/app/components/game-form/game-form.component.html
+++ b/annotation-app/src/app/components/game-form/game-form.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="container mainArea">
diff --git a/annotation-app/src/app/components/game-form/game-form.component.scss b/annotation-app/src/app/components/game-form/game-form.component.scss
index 60913727..5f60f3fa 100644
--- a/annotation-app/src/app/components/game-form/game-form.component.scss
+++ b/annotation-app/src/app/components/game-form/game-form.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/game-form/game-form.component.ts b/annotation-app/src/app/components/game-form/game-form.component.ts
index d50e9551..ff4928f4 100644
--- a/annotation-app/src/app/components/game-form/game-form.component.ts
+++ b/annotation-app/src/app/components/game-form/game-form.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/header/header.component.html b/annotation-app/src/app/components/header/header.component.html
index 4d1a2301..fc868dab 100644
--- a/annotation-app/src/app/components/header/header.component.html
+++ b/annotation-app/src/app/components/header/header.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <clr-header>
diff --git a/annotation-app/src/app/components/header/header.component.scss b/annotation-app/src/app/components/header/header.component.scss
index 03305bb5..73f3a0a9 100644
--- a/annotation-app/src/app/components/header/header.component.scss
+++ b/annotation-app/src/app/components/header/header.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 clr-header {
diff --git a/annotation-app/src/app/components/header/header.component.ts b/annotation-app/src/app/components/header/header.component.ts
index f22c38fb..88adfb7a 100644
--- a/annotation-app/src/app/components/header/header.component.ts
+++ b/annotation-app/src/app/components/header/header.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/home/home.component.html b/annotation-app/src/app/components/home/home.component.html
index c6bab33b..7b4d9049 100644
--- a/annotation-app/src/app/components/home/home.component.html
+++ b/annotation-app/src/app/components/home/home.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="clr-row">
diff --git a/annotation-app/src/app/components/home/home.component.scss b/annotation-app/src/app/components/home/home.component.scss
index 6899194e..1b97a9b7 100644
--- a/annotation-app/src/app/components/home/home.component.scss
+++ b/annotation-app/src/app/components/home/home.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/home/home.component.ts b/annotation-app/src/app/components/home/home.component.ts
index 31699341..319c193d 100644
--- a/annotation-app/src/app/components/home/home.component.ts
+++ b/annotation-app/src/app/components/home/home.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/login/login.component.html b/annotation-app/src/app/components/login/login.component.html
index 95bb7cf6..3cb3e9fc 100644
--- a/annotation-app/src/app/components/login/login.component.html
+++ b/annotation-app/src/app/components/login/login.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="spinner-container" style="text-align: center">
diff --git a/annotation-app/src/app/components/login/login.component.scss b/annotation-app/src/app/components/login/login.component.scss
index 976641cd..477ca86d 100644
--- a/annotation-app/src/app/components/login/login.component.scss
+++ b/annotation-app/src/app/components/login/login.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/login/login.component.ts b/annotation-app/src/app/components/login/login.component.ts
index e1064b18..2dd811b9 100644
--- a/annotation-app/src/app/components/login/login.component.ts
+++ b/annotation-app/src/app/components/login/login.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/my-datasets/my-datasets.component.html b/annotation-app/src/app/components/my-datasets/my-datasets.component.html
index ada3ba00..0a9285d3 100644
--- a/annotation-app/src/app/components/my-datasets/my-datasets.component.html
+++ b/annotation-app/src/app/components/my-datasets/my-datasets.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="container mainArea">
diff --git a/annotation-app/src/app/components/my-datasets/my-datasets.component.scss b/annotation-app/src/app/components/my-datasets/my-datasets.component.scss
index c4ec5e10..6f2ed618 100644
--- a/annotation-app/src/app/components/my-datasets/my-datasets.component.scss
+++ b/annotation-app/src/app/components/my-datasets/my-datasets.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/my-datasets/my-datasets.component.ts b/annotation-app/src/app/components/my-datasets/my-datasets.component.ts
index 7d6c1930..aaf13535 100644
--- a/annotation-app/src/app/components/my-datasets/my-datasets.component.ts
+++ b/annotation-app/src/app/components/my-datasets/my-datasets.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/open-source/basic-login/basic-login.component.html b/annotation-app/src/app/components/open-source/basic-login/basic-login.component.html
index c2e2a726..56b3052c 100644
--- a/annotation-app/src/app/components/open-source/basic-login/basic-login.component.html
+++ b/annotation-app/src/app/components/open-source/basic-login/basic-login.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="login-wrapper">
diff --git a/annotation-app/src/app/components/open-source/basic-login/basic-login.component.scss b/annotation-app/src/app/components/open-source/basic-login/basic-login.component.scss
index a26cf14f..663dd298 100644
--- a/annotation-app/src/app/components/open-source/basic-login/basic-login.component.scss
+++ b/annotation-app/src/app/components/open-source/basic-login/basic-login.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/open-source/basic-login/basic-login.component.ts b/annotation-app/src/app/components/open-source/basic-login/basic-login.component.ts
index 4fb58877..6c364b3c 100644
--- a/annotation-app/src/app/components/open-source/basic-login/basic-login.component.ts
+++ b/annotation-app/src/app/components/open-source/basic-login/basic-login.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/open-source/openSource-routing.module.ts b/annotation-app/src/app/components/open-source/openSource-routing.module.ts
index 9e3ce183..99dd54a4 100644
--- a/annotation-app/src/app/components/open-source/openSource-routing.module.ts
+++ b/annotation-app/src/app/components/open-source/openSource-routing.module.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/open-source/openSource.module.ts b/annotation-app/src/app/components/open-source/openSource.module.ts
index 572d3467..e3b4f500 100644
--- a/annotation-app/src/app/components/open-source/openSource.module.ts
+++ b/annotation-app/src/app/components/open-source/openSource.module.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/page-not-found/page-not-found.component.html b/annotation-app/src/app/components/page-not-found/page-not-found.component.html
index 6f72b273..7d5637af 100644
--- a/annotation-app/src/app/components/page-not-found/page-not-found.component.html
+++ b/annotation-app/src/app/components/page-not-found/page-not-found.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="clr-row">
diff --git a/annotation-app/src/app/components/page-not-found/page-not-found.component.scss b/annotation-app/src/app/components/page-not-found/page-not-found.component.scss
index 78507109..dc6ba52a 100644
--- a/annotation-app/src/app/components/page-not-found/page-not-found.component.scss
+++ b/annotation-app/src/app/components/page-not-found/page-not-found.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/page-not-found/page-not-found.component.ts b/annotation-app/src/app/components/page-not-found/page-not-found.component.ts
index 8a00a0e9..1e446d1d 100644
--- a/annotation-app/src/app/components/page-not-found/page-not-found.component.ts
+++ b/annotation-app/src/app/components/page-not-found/page-not-found.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/annotate/annotate.component.html b/annotation-app/src/app/components/projects/annotate/annotate.component.html
index 167fc60f..60cad9a6 100644
--- a/annotation-app/src/app/components/projects/annotate/annotate.component.html
+++ b/annotation-app/src/app/components/projects/annotate/annotate.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 <!-- <div class="modalHide" (click)="clickModalHide()"></div> -->
 <form
diff --git a/annotation-app/src/app/components/projects/annotate/annotate.component.scss b/annotation-app/src/app/components/projects/annotate/annotate.component.scss
index 23691ce0..ab39f773 100644
--- a/annotation-app/src/app/components/projects/annotate/annotate.component.scss
+++ b/annotation-app/src/app/components/projects/annotate/annotate.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/annotate/annotate.component.ts b/annotation-app/src/app/components/projects/annotate/annotate.component.ts
index 93f9485e..68ab5d6f 100644
--- a/annotation-app/src/app/components/projects/annotate/annotate.component.ts
+++ b/annotation-app/src/app/components/projects/annotate/annotate.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/appendNewEntries.component.html b/annotation-app/src/app/components/projects/appendNewEntries.component.html
index 3b8be736..9334f372 100644
--- a/annotation-app/src/app/components/projects/appendNewEntries.component.html
+++ b/annotation-app/src/app/components/projects/appendNewEntries.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="container mainArea">
diff --git a/annotation-app/src/app/components/projects/appendNewEntries.component.scss b/annotation-app/src/app/components/projects/appendNewEntries.component.scss
index a457cd7f..c6f28898 100644
--- a/annotation-app/src/app/components/projects/appendNewEntries.component.scss
+++ b/annotation-app/src/app/components/projects/appendNewEntries.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/appendNewEntries.component.ts b/annotation-app/src/app/components/projects/appendNewEntries.component.ts
index 8b5e06de..11ca1a4e 100644
--- a/annotation-app/src/app/components/projects/appendNewEntries.component.ts
+++ b/annotation-app/src/app/components/projects/appendNewEntries.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -15,8 +15,6 @@ import { UploadData } from '../../model/index';
 import { DatasetUtil } from 'app/model/index';
 import { DatasetValidator } from '../../shared/form-validators/dataset-validator';
 import { FormValidatorUtil } from '../../shared/form-validators/form-validator-util';
-import AWS from 'aws-sdk/lib/aws';
-import { Buffer } from 'buffer';
 import { UnZipService } from 'app/services/common/up-zip.service';
 import { EnvironmentsService } from 'app/services/environments.service';
 import { ToolService } from 'app/services/common/tool.service';
diff --git a/annotation-app/src/app/components/projects/create-project.component.html b/annotation-app/src/app/components/projects/create-project.component.html
index d3d1ce14..b5f52011 100644
--- a/annotation-app/src/app/components/projects/create-project.component.html
+++ b/annotation-app/src/app/components/projects/create-project.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <form
@@ -716,6 +716,24 @@ <h3>New Annotation Project</h3>
                   <span>This label has already exist!</span>
                 </clr-tooltip-content>
               </clr-tooltip>
+              <clr-tooltip *ngIf="inputLabelErrMsg">
+                <clr-icon
+                  clrTooltipTrigger
+                  shape="error-standard"
+                  size="18"
+                  style="color: red"
+                  class="valid-tooltip"
+                >
+                </clr-icon>
+                <clr-tooltip-content
+                  class="error-tooltip"
+                  clrPosition="bottom-right"
+                  clrSize="md"
+                  *clrIfOpen
+                >
+                  <span>{{inputLabelErrMsg}}</span>
+                </clr-tooltip-content>
+              </clr-tooltip>
             </div>
             <div *ngIf="isShowNumeric">
               <clr-tooltip *ngIf="sizeError">
@@ -1165,6 +1183,7 @@ <h3>New Annotation Project</h3>
               <a
                 href="https://modal-python.readthedocs.io/en/latest/"
                 target="_blank"
+                rel="noopener"
                 role="tooltip"
                 aria-haspopup="true"
                 class="tooltip tooltip-right"
diff --git a/annotation-app/src/app/components/projects/create-project.component.scss b/annotation-app/src/app/components/projects/create-project.component.scss
index 1c8ef558..d7e47e29 100644
--- a/annotation-app/src/app/components/projects/create-project.component.scss
+++ b/annotation-app/src/app/components/projects/create-project.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/create-project.component.ts b/annotation-app/src/app/components/projects/create-project.component.ts
index 73732dc9..bc950297 100644
--- a/annotation-app/src/app/components/projects/create-project.component.ts
+++ b/annotation-app/src/app/components/projects/create-project.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -118,6 +118,7 @@ export class CreateNewComponent implements OnInit {
   dropdownSelected: string;
   checkboxChecked: any = [];
   helpfulText: any = [];
+  inputLabelErrMsg: string;
 
   constructor(
     private formBuilder: FormBuilder,
@@ -492,8 +493,8 @@ export class CreateNewComponent implements OnInit {
   }
 
   updateLabel(data) {
-    if (data && this.inputLabelValidation == false) {
-      this.categoryList.push(data);
+    if (data.trim() && this.inputLabelValidation == false && !this.inputLabelErrMsg) {
+      this.categoryList.push(data.trim());
       if (this.projectType === 'ner') {
         this.dsDialogForm.get('labels').setValue([...this.categoryList, ...this.checkboxChecked]);
       } else {
@@ -725,17 +726,25 @@ export class CreateNewComponent implements OnInit {
         );
         return;
       }
+      let commaLabel = [];
       for (let d = 0; d < flag.length; d++) {
-        if (flag[d] == null || String(flag[d]).trim() == '') {
+        if (!flag[d] || String(flag[d]).trim() == '') {
           flag.splice(d, 1);
         }
-        if (flag[d].length > 50) {
+        // to check format comma
+        let c = String(flag[d]).trim();
+        if (/[,，]/g.test(c)) {
+          commaLabel = [...commaLabel, ...c.split(',')];
+          flag.splice(d, 1);
+        }
+        if (flag[d] && flag[d].length > 50) {
           this.overPerLabelLimit = true;
           const sliceStr = flag[d].slice(0, 50);
           flag.splice(d, 1, sliceStr);
         }
       }
-      this.categoryList = flag;
+      let newCommaLabel = _.uniq(commaLabel);
+      this.categoryList = [...flag, ...newCommaLabel];
       this.dsDialogForm.get('labels').setValue(this.categoryList);
     } else if (selectedLabelIndex > -1 && isNumeric) {
       this.isNumeric = true;
@@ -849,17 +858,23 @@ export class CreateNewComponent implements OnInit {
 
   onLabelKeydown(e) {
     if (this.projectType === 'ner') {
-      if (this.dsDialogForm.value.labels.indexOf(e.target.value) !== -1) {
+      if (this.dsDialogForm.value.labels.indexOf(e.target.value.trim()) !== -1) {
         this.inputLabelValidation = true;
       } else {
         this.inputLabelValidation = false;
       }
     } else {
-      if (this.categoryList.indexOf(e.target.value) !== -1) {
+      if (this.categoryList.indexOf(e.target.value.trim()) !== -1) {
         this.inputLabelValidation = true;
       } else {
         this.inputLabelValidation = false;
       }
+      // to check format comma
+      if (/[,，]/g.test(e.target.value.trim())) {
+        this.inputLabelErrMsg = 'Wrong format! Not allow comma.';
+      } else {
+        this.inputLabelErrMsg = '';
+      }
     }
   }
 
@@ -1274,7 +1289,7 @@ export class CreateNewComponent implements OnInit {
   closeWizard() {
     this.isShowSetdataWizard = false;
   }
-  
+
   receiveWizardInfo(e) {
     this.dropdownSelected = e.dropdownSelected;
     this.checkboxChecked = e.checkboxChecked;
diff --git a/annotation-app/src/app/components/projects/download/download.component.html b/annotation-app/src/app/components/projects/download/download.component.html
index 9c0fa5f8..3352f414 100644
--- a/annotation-app/src/app/components/projects/download/download.component.html
+++ b/annotation-app/src/app/components/projects/download/download.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="modal footerLeft">
diff --git a/annotation-app/src/app/components/projects/download/download.component.scss b/annotation-app/src/app/components/projects/download/download.component.scss
index fe2e685a..ee3dfa53 100644
--- a/annotation-app/src/app/components/projects/download/download.component.scss
+++ b/annotation-app/src/app/components/projects/download/download.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/download/download.component.ts b/annotation-app/src/app/components/projects/download/download.component.ts
index 7a07e0ed..1b99c3e2 100644
--- a/annotation-app/src/app/components/projects/download/download.component.ts
+++ b/annotation-app/src/app/components/projects/download/download.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/generate/generate.component.html b/annotation-app/src/app/components/projects/generate/generate.component.html
index 6aace6e1..feb20741 100644
--- a/annotation-app/src/app/components/projects/generate/generate.component.html
+++ b/annotation-app/src/app/components/projects/generate/generate.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="modal footerLeft">
diff --git a/annotation-app/src/app/components/projects/generate/generate.component.scss b/annotation-app/src/app/components/projects/generate/generate.component.scss
index 29a19dbf..1b81347b 100644
--- a/annotation-app/src/app/components/projects/generate/generate.component.scss
+++ b/annotation-app/src/app/components/projects/generate/generate.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/generate/generate.component.ts b/annotation-app/src/app/components/projects/generate/generate.component.ts
index 1f579222..2c9e250d 100644
--- a/annotation-app/src/app/components/projects/generate/generate.component.ts
+++ b/annotation-app/src/app/components/projects/generate/generate.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/preview/preview-projects.component.html b/annotation-app/src/app/components/projects/preview/preview-projects.component.html
index ae228e71..52340a09 100644
--- a/annotation-app/src/app/components/projects/preview/preview-projects.component.html
+++ b/annotation-app/src/app/components/projects/preview/preview-projects.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="container mainArea">
@@ -223,7 +223,7 @@ <h4>Latest Data</h4>
                     <clr-dg-cell class="ellipsis-datagrid previewHeight" style="max-width: 90px">
                       {{ i + 1 }}
                     </clr-dg-cell>
-                    <ng-container *ngIf="!dataset.projectType || dataset.projectType !== 'log'">
+                    <ng-container *ngIf="dataset.projectType !== 'log'">
                       <clr-dg-cell
                         *ngFor="let content of dataset.originalData"
                         class="previewHeight ellipsis-datagrid"
diff --git a/annotation-app/src/app/components/projects/preview/preview-projects.component.scss b/annotation-app/src/app/components/projects/preview/preview-projects.component.scss
index b489f4a3..e1dca579 100644
--- a/annotation-app/src/app/components/projects/preview/preview-projects.component.scss
+++ b/annotation-app/src/app/components/projects/preview/preview-projects.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/preview/preview-projects.component.ts b/annotation-app/src/app/components/projects/preview/preview-projects.component.ts
index d533f054..6800876f 100644
--- a/annotation-app/src/app/components/projects/preview/preview-projects.component.ts
+++ b/annotation-app/src/app/components/projects/preview/preview-projects.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -190,8 +190,10 @@ export class previewProjectsComponent implements OnInit, AfterViewInit {
       this.projectType == 'ner'
         ? ['Entity', 'Text', 'Start_idx', 'End_idx']
         : ['LineNumber', 'LineContent', 'Label', 'FreeText'];
-    this.getALLSrs();
-    this.getALLFlag();
+    setTimeout(() => {
+      this.getALLSrs();
+      this.getALLFlag();
+    }, 1000);
   }
 
   getSamplingStrategy(queryStrategy: any) {
@@ -334,6 +336,7 @@ export class previewProjectsComponent implements OnInit, AfterViewInit {
     this.avaService.getALLSrs(this.getALLSrsParam).subscribe(
       (res) => {
         if (res) {
+          const resCopy = JSON.parse(JSON.stringify(res));
           const oldRes = JSON.parse(JSON.stringify(res.data));
           this.totalItems = res.pageInfo.totalRowss;
           this.totalPages = res.pageInfo.totalPages;
@@ -368,7 +371,7 @@ export class previewProjectsComponent implements OnInit, AfterViewInit {
               res[w].selected = false;
             }
           } else {
-            if (flag.length > 0) {
+            if (flag.length > 0 && resCopy.pageInfo.currentPage === 1) {
               const pre = [];
               _.forIn(flag[0], function (value, key) {
                 pre.push(key);
@@ -378,11 +381,14 @@ export class previewProjectsComponent implements OnInit, AfterViewInit {
             for (let j = 0; j < flag.length; j++) {
               const a = flag[j];
               const cell = [];
-              for (const key in a) {
+              for (const index in this.previewSrsHeader) {
+                let key = this.previewSrsHeader[index];
                 cell.push(a[key]);
               }
+
               cellContent.push(cell);
             }
+
             for (let k = 0; k < res.length; k++) {
               res[k].originalData = cellContent[k];
             }
@@ -398,12 +404,14 @@ export class previewProjectsComponent implements OnInit, AfterViewInit {
               }
             });
           }
-
-          this.previewSrs = res;
-          // console.log('this.previewSrs:::', this.previewSrs)
-          // console.log('oldRes:::', oldRes)
+          setTimeout(() => {
+            this.previewSrs = res;
+            // console.log('this.previewSrs:::', this.previewSrs);
+            // console.log('oldRes:::', oldRes)
+          }, 100);
 
           if (this.projectType == 'image') {
+            this.previewSrs = res;
             setTimeout(() => {
               const detailRowDom = this.el.nativeElement.querySelectorAll(
                 'clr-dg-row-detail.datagrid-row-detail',
@@ -477,6 +485,7 @@ export class previewProjectsComponent implements OnInit, AfterViewInit {
             this.loading = false;
           }
           if (this.isMultipleLabel && this.projectType != 'ner' && this.projectType != 'log') {
+            this.previewSrs = res;
             this.toRenewPreviewSrs();
           }
           this.firstLoadTable = false;
diff --git a/annotation-app/src/app/components/projects/projects.component.html b/annotation-app/src/app/components/projects/projects.component.html
index 0bd7a50c..3330a611 100644
--- a/annotation-app/src/app/components/projects/projects.component.html
+++ b/annotation-app/src/app/components/projects/projects.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="container mainArea">
diff --git a/annotation-app/src/app/components/projects/projects.component.scss b/annotation-app/src/app/components/projects/projects.component.scss
index 1ffdbf78..43efceff 100644
--- a/annotation-app/src/app/components/projects/projects.component.scss
+++ b/annotation-app/src/app/components/projects/projects.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/projects.component.ts b/annotation-app/src/app/components/projects/projects.component.ts
index 2f05ebbd..54bd9d31 100644
--- a/annotation-app/src/app/components/projects/projects.component.ts
+++ b/annotation-app/src/app/components/projects/projects.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -185,7 +185,7 @@ export class ProjectsComponent implements OnInit {
             generateDoneTime: res.updateTime,
             format: res.format,
             downloadUrl: this.env.config.enableAWSS3
-              ? new Buffer(res.file, 'base64').toString()
+              ? Buffer.from(res.file, 'base64').toString()
               : res.file,
             datasets: this.datasets,
             id: e.id,
@@ -379,7 +379,7 @@ export class ProjectsComponent implements OnInit {
         this.infoMessage =
           'Dataset with annotations is already been generated. Please refresh the page.';
         this.downloadUrl = this.env.config.enableAWSS3
-          ? new Buffer(e.Body.file, 'base64').toString()
+          ? Buffer.from(e.Body.file, 'base64').toString()
           : e.Body.file;
         this.downloadProject();
         this.getProjects();
diff --git a/annotation-app/src/app/components/projects/set-data/set-data.component.html b/annotation-app/src/app/components/projects/set-data/set-data.component.html
index 276057b8..4022e7fc 100644
--- a/annotation-app/src/app/components/projects/set-data/set-data.component.html
+++ b/annotation-app/src/app/components/projects/set-data/set-data.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <clr-wizard #wizard [clrWizardOpen]="true" (clrWizardOpenChange)="clrWizardOpenChange($event)">
@@ -110,24 +110,22 @@
               <input
                 type="checkbox"
                 clrCheckbox
-                name="options"
+                name="checkbox1"
                 [ngClass]="{
                   'disabled-checkbox': column.checkboxDisabled
                 }"
                 [disabled]="column.checkboxDisabled"
-                [(ngModel)]="column.labelChecked"
-                (ngModelChange)="changeCheckbox(column.name, 'labelChecked')"
-                [ngModelOptions]="{ standalone: true }"
+                [checked]="column.labelChecked"
+                (change)="changeCheckbox(column.name, 'labelChecked')"
               />
             </clr-dg-cell>
             <clr-dg-cell class="ellipsis-datagrid">
               <input
                 type="checkbox"
                 clrCheckbox
-                name="options"
-                [(ngModel)]="column.helptextChecked"
-                (ngModelChange)="changeCheckbox(column.name, 'helptextChecked')"
-                [ngModelOptions]="{ standalone: true }"
+                name="checkbox2"
+                [checked]="column.helptextChecked"
+                (change)="changeCheckbox(column.name, 'helptextChecked')"
               />
             </clr-dg-cell>
           </clr-dg-row>
diff --git a/annotation-app/src/app/components/projects/set-data/set-data.component.scss b/annotation-app/src/app/components/projects/set-data/set-data.component.scss
index 02126cfa..2d249a78 100644
--- a/annotation-app/src/app/components/projects/set-data/set-data.component.scss
+++ b/annotation-app/src/app/components/projects/set-data/set-data.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 table {
diff --git a/annotation-app/src/app/components/projects/set-data/set-data.component.ts b/annotation-app/src/app/components/projects/set-data/set-data.component.ts
index 1fdd0dfc..35591709 100644
--- a/annotation-app/src/app/components/projects/set-data/set-data.component.ts
+++ b/annotation-app/src/app/components/projects/set-data/set-data.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -38,7 +38,6 @@ export class SetDataComponent implements OnInit, OnChanges {
   formDatagrid: any;
 
   ngOnInit() {
-    this.wizard.navService.updateNavigation();
     if (this.wizardData.projectType === 'ner') {
       this.clrSelectData = {
         required: true,
@@ -55,6 +54,15 @@ export class SetDataComponent implements OnInit, OnChanges {
       }
     } else {
       this.checkboxColumns = JSON.parse(JSON.stringify(this.wizardData.csvHeaders));
+      if (this.wizardData.dropdownSelected) {
+        let that = this;
+        this.checkboxColumns = _.remove(
+          JSON.parse(JSON.stringify(this.wizardData.csvHeaders)),
+          function (n) {
+            return n != that.wizardData.dropdownSelected;
+          },
+        );
+      }
       this.clrSelectData = {
         required: true,
         options: [...['No Labels'], ...this.wizardData.csvHeaders],
@@ -104,7 +112,7 @@ export class SetDataComponent implements OnInit, OnChanges {
     let index = _.findIndex(this.checkboxColumns, function (o) {
       return o.name === data;
     });
-    !this.checkboxColumns[index][from];
+    this.checkboxColumns[index][from] = !this.checkboxColumns[index][from];
   }
 
   goBack(_e): void {
diff --git a/annotation-app/src/app/components/projects/supercollider.component.html b/annotation-app/src/app/components/projects/supercollider.component.html
index c93e3fe2..50408920 100644
--- a/annotation-app/src/app/components/projects/supercollider.component.html
+++ b/annotation-app/src/app/components/projects/supercollider.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <form
diff --git a/annotation-app/src/app/components/projects/supercollider.component.scss b/annotation-app/src/app/components/projects/supercollider.component.scss
index 5e97e2eb..cf3d0ccd 100644
--- a/annotation-app/src/app/components/projects/supercollider.component.scss
+++ b/annotation-app/src/app/components/projects/supercollider.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/supercollider.component.ts b/annotation-app/src/app/components/projects/supercollider.component.ts
index 5ef623b8..71f2404c 100644
--- a/annotation-app/src/app/components/projects/supercollider.component.ts
+++ b/annotation-app/src/app/components/projects/supercollider.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/projects/upload-label/upload-label.component.html b/annotation-app/src/app/components/projects/upload-label/upload-label.component.html
index 715fb282..6f659f50 100644
--- a/annotation-app/src/app/components/projects/upload-label/upload-label.component.html
+++ b/annotation-app/src/app/components/projects/upload-label/upload-label.component.html
@@ -1,3 +1,5 @@
+<!-- Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0 -->
 <form [formGroup]="uploadGroup" (keydown.enter)="$event.preventDefault()" autocomplete="off">
   <div class="modal">
     <div class="modal-dialog modal-md" role="dialog" aria-hidden="true">
diff --git a/annotation-app/src/app/components/projects/upload-label/upload-label.component.scss b/annotation-app/src/app/components/projects/upload-label/upload-label.component.scss
index 5176dfc0..a0bff4d6 100644
--- a/annotation-app/src/app/components/projects/upload-label/upload-label.component.scss
+++ b/annotation-app/src/app/components/projects/upload-label/upload-label.component.scss
@@ -1,3 +1,7 @@
+/*
+Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0
+*/
 clr-alert {
   margin-top: 1rem;
 }
diff --git a/annotation-app/src/app/components/projects/upload-label/upload-label.component.ts b/annotation-app/src/app/components/projects/upload-label/upload-label.component.ts
index 662000c9..6f94fd28 100644
--- a/annotation-app/src/app/components/projects/upload-label/upload-label.component.ts
+++ b/annotation-app/src/app/components/projects/upload-label/upload-label.component.ts
@@ -1,3 +1,7 @@
+/*
+Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0
+*/
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { UserAuthService } from 'app/services/user-auth.service';
diff --git a/annotation-app/src/app/components/treeview-modal/treeview-modal.component.html b/annotation-app/src/app/components/treeview-modal/treeview-modal.component.html
index 16101b96..4fddc892 100644
--- a/annotation-app/src/app/components/treeview-modal/treeview-modal.component.html
+++ b/annotation-app/src/app/components/treeview-modal/treeview-modal.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <div class="modal">
diff --git a/annotation-app/src/app/components/treeview-modal/treeview-modal.component.scss b/annotation-app/src/app/components/treeview-modal/treeview-modal.component.scss
index c8005646..b30eefc7 100644
--- a/annotation-app/src/app/components/treeview-modal/treeview-modal.component.scss
+++ b/annotation-app/src/app/components/treeview-modal/treeview-modal.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 .disableTree {
diff --git a/annotation-app/src/app/components/treeview-modal/treeview-modal.component.ts b/annotation-app/src/app/components/treeview-modal/treeview-modal.component.ts
index 569a752c..65c1f54a 100644
--- a/annotation-app/src/app/components/treeview-modal/treeview-modal.component.ts
+++ b/annotation-app/src/app/components/treeview-modal/treeview-modal.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
diff --git a/annotation-app/src/app/components/upload/upload.component.html b/annotation-app/src/app/components/upload/upload.component.html
index f7b8933c..df000d23 100644
--- a/annotation-app/src/app/components/upload/upload.component.html
+++ b/annotation-app/src/app/components/upload/upload.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <form [formGroup]="uploadGroup" (keydown.enter)="$event.preventDefault()" autocomplete="off">
diff --git a/annotation-app/src/app/components/upload/upload.component.scss b/annotation-app/src/app/components/upload/upload.component.scss
index a9797f00..b53f2312 100644
--- a/annotation-app/src/app/components/upload/upload.component.scss
+++ b/annotation-app/src/app/components/upload/upload.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/upload/upload.component.ts b/annotation-app/src/app/components/upload/upload.component.ts
index ed3085d1..ce7cd951 100644
--- a/annotation-app/src/app/components/upload/upload.component.ts
+++ b/annotation-app/src/app/components/upload/upload.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/widgets/clr-select.component.ts b/annotation-app/src/app/components/widgets/clr-select.component.ts
index 0db1ae85..7f93710a 100644
--- a/annotation-app/src/app/components/widgets/clr-select.component.ts
+++ b/annotation-app/src/app/components/widgets/clr-select.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/widgets/dropdown-page.component.ts b/annotation-app/src/app/components/widgets/dropdown-page.component.ts
index a1acc060..c1771f15 100644
--- a/annotation-app/src/app/components/widgets/dropdown-page.component.ts
+++ b/annotation-app/src/app/components/widgets/dropdown-page.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/components/widgets/index.ts b/annotation-app/src/app/components/widgets/index.ts
index 53944751..1faa7927 100644
--- a/annotation-app/src/app/components/widgets/index.ts
+++ b/annotation-app/src/app/components/widgets/index.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/core.module.ts b/annotation-app/src/app/core.module.ts
index 4876134a..058abd4c 100644
--- a/annotation-app/src/app/core.module.ts
+++ b/annotation-app/src/app/core.module.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/guards/auth.guard.ts b/annotation-app/src/app/guards/auth.guard.ts
index 7f872724..46ac959a 100644
--- a/annotation-app/src/app/guards/auth.guard.ts
+++ b/annotation-app/src/app/guards/auth.guard.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/guards/sso.guard.ts b/annotation-app/src/app/guards/sso.guard.ts
index bd43e685..51c35c79 100644
--- a/annotation-app/src/app/guards/sso.guard.ts
+++ b/annotation-app/src/app/guards/sso.guard.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/index.ts b/annotation-app/src/app/index.ts
index f03fa161..c45c38c1 100644
--- a/annotation-app/src/app/index.ts
+++ b/annotation-app/src/app/index.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/model/authentication.ts b/annotation-app/src/app/model/authentication.ts
index a37f1fb1..546e53f8 100644
--- a/annotation-app/src/app/model/authentication.ts
+++ b/annotation-app/src/app/model/authentication.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/model/dataset.ts b/annotation-app/src/app/model/dataset.ts
index f61e7b77..e757d52b 100644
--- a/annotation-app/src/app/model/dataset.ts
+++ b/annotation-app/src/app/model/dataset.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/model/env.ts b/annotation-app/src/app/model/env.ts
index 484173f9..ff9e2d9c 100644
--- a/annotation-app/src/app/model/env.ts
+++ b/annotation-app/src/app/model/env.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/model/incentives.ts b/annotation-app/src/app/model/incentives.ts
index 925f370f..5d0d13be 100644
--- a/annotation-app/src/app/model/incentives.ts
+++ b/annotation-app/src/app/model/incentives.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/model/index.ts b/annotation-app/src/app/model/index.ts
index e755ed14..28d35d1f 100644
--- a/annotation-app/src/app/model/index.ts
+++ b/annotation-app/src/app/model/index.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/model/sr.ts b/annotation-app/src/app/model/sr.ts
index f6efeeb2..808b0823 100644
--- a/annotation-app/src/app/model/sr.ts
+++ b/annotation-app/src/app/model/sr.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/model/upload.ts b/annotation-app/src/app/model/upload.ts
index fb2b373b..de0b84b0 100644
--- a/annotation-app/src/app/model/upload.ts
+++ b/annotation-app/src/app/model/upload.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/model/user.ts b/annotation-app/src/app/model/user.ts
index 1e210401..91bc0048 100644
--- a/annotation-app/src/app/model/user.ts
+++ b/annotation-app/src/app/model/user.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/pipes/full-name.pipe.ts b/annotation-app/src/app/pipes/full-name.pipe.ts
index 2f9cc2f4..22d9e9a5 100644
--- a/annotation-app/src/app/pipes/full-name.pipe.ts
+++ b/annotation-app/src/app/pipes/full-name.pipe.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/pipes/math-round.pipe.ts b/annotation-app/src/app/pipes/math-round.pipe.ts
index f2ff6479..85c037dc 100644
--- a/annotation-app/src/app/pipes/math-round.pipe.ts
+++ b/annotation-app/src/app/pipes/math-round.pipe.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/pipes/sliceText.pipe.ts b/annotation-app/src/app/pipes/sliceText.pipe.ts
index b6863ccb..afa0c58f 100644
--- a/annotation-app/src/app/pipes/sliceText.pipe.ts
+++ b/annotation-app/src/app/pipes/sliceText.pipe.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/pipes/to-upper-case.pipe.ts b/annotation-app/src/app/pipes/to-upper-case.pipe.ts
index 2355bdb4..5009a59d 100644
--- a/annotation-app/src/app/pipes/to-upper-case.pipe.ts
+++ b/annotation-app/src/app/pipes/to-upper-case.pipe.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/ava.service.ts b/annotation-app/src/app/services/ava.service.ts
index 409a64c8..96ecaff2 100644
--- a/annotation-app/src/app/services/ava.service.ts
+++ b/annotation-app/src/app/services/ava.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/common/common.service.ts b/annotation-app/src/app/services/common/common.service.ts
index 2bf61a4c..301c85a1 100644
--- a/annotation-app/src/app/services/common/common.service.ts
+++ b/annotation-app/src/app/services/common/common.service.ts
@@ -1,10 +1,9 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
 import { Injectable } from '@angular/core';
-import { resolve } from 'core-js/fn/promise';
 import * as _ from 'lodash';
 import { AvaService } from '../ava.service';
 
diff --git a/annotation-app/src/app/services/common/dom.service.ts b/annotation-app/src/app/services/common/dom.service.ts
index be6e7027..cf4a2f9a 100644
--- a/annotation-app/src/app/services/common/dom.service.ts
+++ b/annotation-app/src/app/services/common/dom.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/common/download.service.ts b/annotation-app/src/app/services/common/download.service.ts
index 20796bf9..cafa67d5 100644
--- a/annotation-app/src/app/services/common/download.service.ts
+++ b/annotation-app/src/app/services/common/download.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/common/email.service.ts b/annotation-app/src/app/services/common/email.service.ts
index 8de26fd8..37c97d1e 100644
--- a/annotation-app/src/app/services/common/email.service.ts
+++ b/annotation-app/src/app/services/common/email.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/common/markdown-parser.service.ts b/annotation-app/src/app/services/common/markdown-parser.service.ts
index 4257ba73..01fb6a5a 100644
--- a/annotation-app/src/app/services/common/markdown-parser.service.ts
+++ b/annotation-app/src/app/services/common/markdown-parser.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/common/s3.service.ts b/annotation-app/src/app/services/common/s3.service.ts
index 39373898..69fb7ac9 100644
--- a/annotation-app/src/app/services/common/s3.service.ts
+++ b/annotation-app/src/app/services/common/s3.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -22,11 +22,11 @@ export class S3Service {
           if (res) {
             let outNo = new Date().getTime();
             const s3 = new AWS.S3({
-              region: new Buffer(res.region, 'base64').toString(),
-              apiVersion: new Buffer(res.apiVersion, 'base64').toString(),
-              accessKeyId: new Buffer(res.credentials.accessKeyId, 'base64').toString(),
-              secretAccessKey: new Buffer(res.credentials.secretAccessKey, 'base64').toString(),
-              sessionToken: new Buffer(res.credentials.sessionToken, 'base64').toString(),
+              region: Buffer.from(res.region, 'base64').toString(),
+              apiVersion: Buffer.from(res.apiVersion, 'base64').toString(),
+              accessKeyId: Buffer.from(res.credentials.accessKeyId, 'base64').toString(),
+              secretAccessKey: Buffer.from(res.credentials.secretAccessKey, 'base64').toString(),
+              sessionToken: Buffer.from(res.credentials.sessionToken, 'base64').toString(),
             });
 
             response = {
@@ -81,8 +81,8 @@ export class S3Service {
             }
           } else {
             const uploadParams = {
-              Bucket: new Buffer(e.res.bucket, 'base64').toString(),
-              Key: new Buffer(e.res.key, 'base64').toString() + '/' + e.outNo + '_' + file.name,
+              Bucket: Buffer.from(e.res.bucket, 'base64').toString(),
+              Key: Buffer.from(e.res.key, 'base64').toString() + '/' + e.outNo + '_' + file.name,
               Body: file,
             };
             const data = await e.s3.upload(uploadParams).promise();
@@ -107,8 +107,8 @@ export class S3Service {
       let realEntryIndex = 0;
       for (let i = 0; i < entry.length; i++) {
         const uploadParams = {
-          Bucket: new Buffer(s3Config.bucket, 'base64').toString(),
-          Key: new Buffer(s3Config.key, 'base64').toString() + '/' + outNo + '/' + entry[i].name,
+          Bucket: Buffer.from(s3Config.bucket, 'base64').toString(),
+          Key: Buffer.from(s3Config.key, 'base64').toString() + '/' + outNo + '/' + entry[i].name,
           Body: entry[i].file,
         };
         s3.upload(uploadParams, async function (err, data) {
@@ -148,9 +148,9 @@ export class S3Service {
             await (value1 as any).async('blob').then(async function (blob) {
               realEntryIndex++;
               const uploadParams = {
-                Bucket: new Buffer(res.bucket, 'base64').toString(),
+                Bucket: Buffer.from(res.bucket, 'base64').toString(),
                 Key:
-                  new Buffer(res.key, 'base64').toString() +
+                  Buffer.from(res.key, 'base64').toString() +
                   '/' +
                   outNo +
                   '/' +
diff --git a/annotation-app/src/app/services/common/tool.service.ts b/annotation-app/src/app/services/common/tool.service.ts
index 3b1504e1..8f7bb9f2 100644
--- a/annotation-app/src/app/services/common/tool.service.ts
+++ b/annotation-app/src/app/services/common/tool.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
@@ -13,7 +13,7 @@ export class ToolService {
   constructor(public env: EnvironmentsService) {}
 
   hexToRgb(c) {
-    if (c.length == 4) {
+    if (c && c.length == 4) {
       c = '#' + [c[1], c[1], c[2], c[2], c[3], c[3]].join('');
     }
     c = '0x' + c.substring(1);
@@ -21,7 +21,7 @@ export class ToolService {
   }
 
   highToRgb(c) {
-    if (c.length == 4) {
+    if (c && c.length == 4) {
       c = '#' + [c[1], c[1], c[2], c[2], c[3], c[3]].join('');
     }
     c = '0x' + c.substring(1);
diff --git a/annotation-app/src/app/services/common/up-zip.service.ts b/annotation-app/src/app/services/common/up-zip.service.ts
index 703a9526..133f9635 100644
--- a/annotation-app/src/app/services/common/up-zip.service.ts
+++ b/annotation-app/src/app/services/common/up-zip.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/environments.service.ts b/annotation-app/src/app/services/environments.service.ts
index de666162..4b9362aa 100644
--- a/annotation-app/src/app/services/environments.service.ts
+++ b/annotation-app/src/app/services/environments.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/feedback.service.ts b/annotation-app/src/app/services/feedback.service.ts
index ce4747fc..cbd389ce 100644
--- a/annotation-app/src/app/services/feedback.service.ts
+++ b/annotation-app/src/app/services/feedback.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/label-studio.service.ts b/annotation-app/src/app/services/label-studio.service.ts
index 2e564d16..234afb8d 100644
--- a/annotation-app/src/app/services/label-studio.service.ts
+++ b/annotation-app/src/app/services/label-studio.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/services/user-auth.service.ts b/annotation-app/src/app/services/user-auth.service.ts
index 0199c901..9b228814 100644
--- a/annotation-app/src/app/services/user-auth.service.ts
+++ b/annotation-app/src/app/services/user-auth.service.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/shared/clr-filter/datagridFilter.component.html b/annotation-app/src/app/shared/clr-filter/datagridFilter.component.html
index db8aa05d..b922494d 100644
--- a/annotation-app/src/app/shared/clr-filter/datagridFilter.component.html
+++ b/annotation-app/src/app/shared/clr-filter/datagridFilter.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 <form class="clr-form">
   <input
diff --git a/annotation-app/src/app/shared/clr-filter/datagridFilter.component.scss b/annotation-app/src/app/shared/clr-filter/datagridFilter.component.scss
index d85f74f5..7cf53622 100644
--- a/annotation-app/src/app/shared/clr-filter/datagridFilter.component.scss
+++ b/annotation-app/src/app/shared/clr-filter/datagridFilter.component.scss
@@ -1,4 +1,4 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
diff --git a/annotation-app/src/app/shared/clr-filter/datagridFilter.component.ts b/annotation-app/src/app/shared/clr-filter/datagridFilter.component.ts
index 28e8cdce..434ee113 100644
--- a/annotation-app/src/app/shared/clr-filter/datagridFilter.component.ts
+++ b/annotation-app/src/app/shared/clr-filter/datagridFilter.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 import { Component, EventEmitter, Input, Output, ViewChild, ElementRef } from '@angular/core';
diff --git a/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.html b/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.html
index ab46aea9..16359fa2 100644
--- a/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.html
+++ b/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 <div class="prev-info clr-row">
   <div class="clr-col-12 clr-col-md-1"></div>
@@ -32,7 +32,7 @@
       (blur)="slackBlur(slack.value)"
       (click)="reAssignSlack($event)"
       class="clr-input"
-      placeholder="(Optional-Pick one of Assignee and Slack) Enter slack channel id"
+      placeholder="(Optional-Pick one of Assignee and Slack) Enter Slack Channel Id"
     />
     <div *ngIf="showChannelList">
       <ul style="margin-bottom: 0">
diff --git a/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.scss b/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.scss
index 86fb663b..3c379cf3 100644
--- a/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.scss
+++ b/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.ts b/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.ts
index 1663310f..e4e283a1 100644
--- a/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.ts
+++ b/annotation-app/src/app/shared/components/assign-slack/assign-slack.component.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/shared/form-validators/dataset-validator.ts b/annotation-app/src/app/shared/form-validators/dataset-validator.ts
index 3776d7db..78b42a3f 100644
--- a/annotation-app/src/app/shared/form-validators/dataset-validator.ts
+++ b/annotation-app/src/app/shared/form-validators/dataset-validator.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/shared/form-validators/form-validator-util.ts b/annotation-app/src/app/shared/form-validators/form-validator-util.ts
index 92002169..4d8a1945 100644
--- a/annotation-app/src/app/shared/form-validators/form-validator-util.ts
+++ b/annotation-app/src/app/shared/form-validators/form-validator-util.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/shared/shared.module.ts b/annotation-app/src/app/shared/shared.module.ts
index d021cf70..49d0d692 100644
--- a/annotation-app/src/app/shared/shared.module.ts
+++ b/annotation-app/src/app/shared/shared.module.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/app/shared/utils/html.ts b/annotation-app/src/app/shared/utils/html.ts
index d37b4627..582889bb 100644
--- a/annotation-app/src/app/shared/utils/html.ts
+++ b/annotation-app/src/app/shared/utils/html.ts
@@ -1,3 +1,7 @@
+/*
+Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0
+*/
 import insertAfter from './index.es5';
 
 function isTextNode(node) {
diff --git a/annotation-app/src/app/shared/utils/index.es5.ts b/annotation-app/src/app/shared/utils/index.es5.ts
index c6581185..e13ee0de 100644
--- a/annotation-app/src/app/shared/utils/index.es5.ts
+++ b/annotation-app/src/app/shared/utils/index.es5.ts
@@ -1,3 +1,7 @@
+/*
+Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0
+*/
 export default function insertAfter(node, _ref) {
   var nextSibling = _ref.nextSibling,
     parentNode = _ref.parentNode;
diff --git a/annotation-app/src/app/shared/utils/treeView.ts b/annotation-app/src/app/shared/utils/treeView.ts
index 9aec1378..5aabf38f 100644
--- a/annotation-app/src/app/shared/utils/treeView.ts
+++ b/annotation-app/src/app/shared/utils/treeView.ts
@@ -1,3 +1,7 @@
+/*
+Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0
+*/
 export function filterTreeLabel(treeArr: any) {
   const findItem = (arr) => {
     let res = [];
diff --git a/annotation-app/src/assets/files/taxonomy_sample.yaml b/annotation-app/src/assets/files/taxonomy_sample.yaml
index ce39dcb0..54a721fe 100644
--- a/annotation-app/src/assets/files/taxonomy_sample.yaml
+++ b/annotation-app/src/assets/files/taxonomy_sample.yaml
@@ -1,3 +1,5 @@
+# Copyright 2019-2022 VMware, Inc.
+# SPDX-License-Identifier: Apache-2.0
 data:
   - name: Products
     children:
diff --git a/annotation-app/src/assets/images/arrow.svg b/annotation-app/src/assets/images/arrow.svg
index ce798f36..2d01bddf 100644
--- a/annotation-app/src/assets/images/arrow.svg
+++ b/annotation-app/src/assets/images/arrow.svg
@@ -1,3 +1,5 @@
+<!-- Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0 -->
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
diff --git a/annotation-app/src/assets/images/clarity_logo.svg b/annotation-app/src/assets/images/clarity_logo.svg
index 61cb52d4..81d8c1a1 100644
--- a/annotation-app/src/assets/images/clarity_logo.svg
+++ b/annotation-app/src/assets/images/clarity_logo.svg
@@ -1,3 +1,5 @@
+<!-- Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0 -->
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   ~ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
diff --git a/annotation-app/src/assets/images/flask.svg b/annotation-app/src/assets/images/flask.svg
index 2933985f..ccaab92e 100644
--- a/annotation-app/src/assets/images/flask.svg
+++ b/annotation-app/src/assets/images/flask.svg
@@ -1,3 +1,5 @@
+<!-- Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0 -->
 <svg version="1.1" width="36" height="36"  viewBox="0 0 36 36" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>flask-solid</title>
     <path fill="white" d="M31.49,27.4,23,14.94V4h1a1,1,0,0,0,0-2H12.08a1,1,0,0,0,0,2H13V14.94L4.58,27.31a4.31,4.31,0,0,0-.78,3A4.23,4.23,0,0,0,8,34H27.86A4.36,4.36,0,0,0,31,32.8,4.23,4.23,0,0,0,31.49,27.4ZM15,15.49V4h6V15.49L26.15,23H9.85Z" class="clr-i-solid clr-i-solid-path-1"></path>
diff --git a/annotation-app/src/assets/images/polygon.svg b/annotation-app/src/assets/images/polygon.svg
index b07b37b5..b2d5c139 100644
--- a/annotation-app/src/assets/images/polygon.svg
+++ b/annotation-app/src/assets/images/polygon.svg
@@ -1,3 +1,5 @@
+<!-- Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0 -->
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
diff --git a/annotation-app/src/assets/images/rect.svg b/annotation-app/src/assets/images/rect.svg
index a750f7f6..c7cf9a80 100644
--- a/annotation-app/src/assets/images/rect.svg
+++ b/annotation-app/src/assets/images/rect.svg
@@ -1,3 +1,5 @@
+<!-- Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0 -->
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
diff --git a/annotation-app/src/assets/images/refresh.svg b/annotation-app/src/assets/images/refresh.svg
index 6e778797..3b0da3ed 100644
--- a/annotation-app/src/assets/images/refresh.svg
+++ b/annotation-app/src/assets/images/refresh.svg
@@ -1,3 +1,5 @@
+<!-- Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0 -->
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
diff --git a/annotation-app/src/assets/images/trash.svg b/annotation-app/src/assets/images/trash.svg
index 09697da8..87b68427 100644
--- a/annotation-app/src/assets/images/trash.svg
+++ b/annotation-app/src/assets/images/trash.svg
@@ -1,3 +1,5 @@
+<!-- Copyright 2019-2022 VMware, Inc.
+SPDX-License-Identifier: Apache-2.0 -->
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
diff --git a/annotation-app/src/environments/environment.prod.ts b/annotation-app/src/environments/environment.prod.ts
index ff08093a..364e434b 100644
--- a/annotation-app/src/environments/environment.prod.ts
+++ b/annotation-app/src/environments/environment.prod.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 import { Env } from 'app/model/index';
diff --git a/annotation-app/src/environments/environment.ts b/annotation-app/src/environments/environment.ts
index 6e6ecb2b..67100e57 100644
--- a/annotation-app/src/environments/environment.ts
+++ b/annotation-app/src/environments/environment.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 // The file contents for the current environment will overwrite these during build.
diff --git a/annotation-app/src/index.html b/annotation-app/src/index.html
index 6063156f..51d0afe2 100644
--- a/annotation-app/src/index.html
+++ b/annotation-app/src/index.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2019-2021 VMware, Inc.
+<!-- Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0 -->
 
 <!DOCTYPE html>
diff --git a/annotation-app/src/libs/categoryChart.js b/annotation-app/src/libs/categoryChart.js
index 897f0b10..c3e89537 100644
--- a/annotation-app/src/libs/categoryChart.js
+++ b/annotation-app/src/libs/categoryChart.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/libs/feedback.js b/annotation-app/src/libs/feedback.js
index 2b05a4de..3107ffc0 100644
--- a/annotation-app/src/libs/feedback.js
+++ b/annotation-app/src/libs/feedback.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/libs/hierarchicalChart.js b/annotation-app/src/libs/hierarchicalChart.js
index da429ded..2c38cc3d 100644
--- a/annotation-app/src/libs/hierarchicalChart.js
+++ b/annotation-app/src/libs/hierarchicalChart.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 function hierarchicalChart(options) {
@@ -19,9 +19,7 @@ function hierarchicalChart(options) {
     .select(container)
     .append('svg')
     .attr('width', options.width)
-    .attr('height', height + margin.top + margin.bottom);
-
-  x = d3.scaleLinear().range([39, height - margin.top]);
+    .attr('height', height + margin.top + margin.bottom).call(zoom);;
 
   root = d3
     .hierarchy(options.data)
@@ -29,31 +27,30 @@ function hierarchicalChart(options) {
     .sort((a, b) => b.value - a.value)
     .eachAfter((d) => (d.index = d.parent ? (d.parent.index = d.parent.index + 1 || 0) : 0));
 
-  x.domain([0, root.value]);
+  var y = d3
+    .scaleLinear()
+    .domain([0, d3.max(root.children, (d) => d.value)])
+    .nice()
+    .range([height - margin.bottom, margin.top]);
 
-  xAxis = (g) =>
-    g
-      .attr('class', 'x-axis')
-      .attr('transform', `translate(40, 340) rotate(-90)`)
-      .call(d3.axisTop(x).ticks(height / 80))
-      .call((g) => (g.selection ? g.selection() : g).append('line').select('.domain').remove())
-      .selectAll('text')
-      .attr('transform', `rotate(90)`)
-      .attr('x', -20)
-      .attr('y', 0)
-      .attr('dy', '.35em');
+  var yAxis = (g) => g
+    .attr('transform', `translate(${margin.left},0)`)
+    .call(d3.axisLeft(y))
+    .call((g) => g.select('.domain'));
+
+  var x = d3
+    .scaleBand()
+    .domain(root.children.map((d) => d.data.name))
+    .range([margin.left, width - margin.right])
+    .padding(0.4);
 
-  yAxis = (g) =>
+  var xAxis = (g) =>
     g
-      .attr('class', 'y-axis')
-      .attr('transform', `translate(0,300) rotate(-90)`)
-      .call((g) =>
-        g
-          .append('line')
-          .attr('stroke', 'currentColor')
-          .attr('y1', margin.left)
-          .attr('y2', width - margin.right),
-      );
+      .attr('transform', `translate(0,${height - margin.bottom})`)
+      .call(d3.axisBottom(x))
+      .selectAll('text')
+      .style('text-anchor', 'start')
+      .attr('transform', 'rotate(20 -10 10)');
 
   svg
     .append('rect')
@@ -69,9 +66,9 @@ function hierarchicalChart(options) {
 
   duration = 0;
 
-  svg.append('g').call(yAxis);
+  svg.append('g').attr('class', 'y-axis').call(yAxis);
 
-  svg.append('g').call(xAxis);
+  svg.append('g').attr('class', 'x-axis').call(xAxis);
 
   down(svg, root);
 
@@ -83,10 +80,6 @@ function hierarchicalChart(options) {
     // Rebind the current node to the background.
     svg.select('.background').datum(d);
 
-    // Define two sequenced transitions.
-    const transition1 = svg.transition().duration(duration);
-    const transition2 = transition1.transition();
-
     // Mark any currently-displayed bars as exiting.
     const exit = svg.selectAll('.enter').attr('class', 'exit');
 
@@ -94,51 +87,34 @@ function hierarchicalChart(options) {
     exit.selectAll('rect').attr('fill-opacity', (p) => (p === d ? 0 : null));
 
     // Transition exiting bars to fade out.
-    exit.transition(transition1).attr('fill-opacity', 0).remove();
-
-    // Enter the new bars for the clicked-on data.
-    // Per above, entering bars are immediately visible.
-    const enter = bar(svg, down, d, '.y-axis').attr('fill-opacity', 0);
-
-    // Have the text fade-in, even though the bars are visible.
-    enter.transition(transition1).attr('fill-opacity', 1);
-
-    // Transition entering bars to their new y-position.
-    enter
-      .selectAll('g')
-      .attr('transform', stack(d.index))
-      .transition(transition1)
-      .attr('transform', stagger());
+    exit.attr('fill-opacity', 0).remove();
 
     // Update the x-scale domain.
-    x.domain([0, d3.max(d.children, (d) => d.value)]);
+    y.domain([0, d3.max(d.children, (d) => d.value)]);
 
     // Update the x-axis.
-    svg.selectAll('.x-axis').transition(transition2).call(xAxis);
+    svg.selectAll('.y-axis').call(yAxis);
 
-    // Transition entering bars to the new x-scale.
-    enter
-      .selectAll('g')
-      .transition(transition2)
-      .attr('transform', (d, i) => `translate(0,${barStep * i})`);
+    // Enter the new bars for the clicked-on data.
+    // Per above, entering bars are immediately visible.
+    const enter = bar(svg, down, d, '.x-axis').attr('fill-opacity', 0);
+
+    // Have the text fade-in, even though the bars are visible.
+    enter.attr('fill-opacity', 1);
 
     // Color the bars as parents; they will fade to children if appropriate.
     enter
       .selectAll('rect')
       .attr('fill', color(true))
       .attr('fill-opacity', 1)
-      .transition(transition2)
       .attr('fill', (d) => color(!!d.children))
-      .attr('width', (d) => x(d.value) - x(0));
+      .attr('height', (d) => y(0) - y(d.value));
   }
 
   function bar(svg, down, d, selector) {
-    barStep = (width - margin.left - margin.right) / d.children.length;
-    barPadding = 0.4;
     const g = svg
       .insert('g', selector)
       .attr('class', 'enter')
-      .attr('transform', `translate(60,340) rotate(-90)`)
       .attr('text-anchor', 'end')
       .style('font', '10px sans-serif');
 
@@ -149,20 +125,20 @@ function hierarchicalChart(options) {
       .attr('cursor', (d) => (!d.children ? null : 'pointer'))
       .on('click', (event, d) => (d.value ? down(svg, d) : null));
 
-    bar
-      .append('text')
-      .attr('x', barStep / 8)
-      .attr('y', -barPadding - 15)
-      .attr('dy', '.35em')
-      .text((d) => d.data.name)
-      .style('text-anchor', 'start')
-      .attr('transform', 'rotate(120 10 10)');
+    x = d3
+      .scaleBand()
+      .domain(d.children.map((d) => d.data.name))
+      .range([margin.left, width - margin.right])
+      .padding(0.4);
 
-    bar
+    svg.selectAll('.x-axis').call(xAxis);
+
+    bar.attr('class', 'bars')
       .append('rect')
-      .attr('x', x(0))
-      .attr('width', (d) => x(d.value) - x(0))
-      .attr('height', barStep * (1 - barPadding) > 0 ? barStep * (1 - barPadding) : 0);
+      .attr('x', (d) => x(d.data.name) + (x.bandwidth() - d3.min([x.bandwidth(), 150])) / 2)
+      .attr('y', (d) => y(d.value))
+      .attr('height', (d) => y(0) - y(d.value))
+      .attr('width', d3.min([x.bandwidth(), 150]));
 
     hierTip = options.tip;
     hierTip
@@ -173,7 +149,7 @@ function hierarchicalChart(options) {
       .style('padding', '0px 5px 0px 5px')
       .style('border-radius', '4px')
       .style('font-size', '10px')
-      .offset([-155, barStep / 4 - barPadding])
+      .offset([-10, 0])
       .html(function (event, d) {
         return '<span>' + d.value + '</span>';
       });
@@ -202,74 +178,58 @@ function hierarchicalChart(options) {
     // Rebind the current node to the background.
     svg.select('.background').datum(d.parent);
 
-    // Define two sequenced transitions.
-    const transition1 = svg.transition().duration(duration);
-    const transition2 = transition1.transition();
-
     // Mark any currently-displayed bars as exiting.
     const exit = svg.selectAll('.enter').attr('class', 'exit');
 
     // Update the x-scale domain.
-    x.domain([0, d3.max(d.parent.children, (d) => d.value)]);
+    y.domain([0, d3.max(d.parent.children, (d) => d.value)]);
 
     // Update the x-axis.
-    svg.selectAll('.x-axis').transition(transition1).call(xAxis);
+    svg.selectAll('.y-axis').call(yAxis);
 
-    // Transition exiting bars to the new x-scale.
-    exit.selectAll('g').transition(transition1).attr('transform', stagger());
-
-    // Transition exiting bars to the parent’s position.
-    exit.selectAll('g').transition(transition2).attr('transform', stack(d.index));
 
     // Transition exiting rects to the new scale and fade to parent color.
     exit
       .selectAll('rect')
-      .transition(transition1)
-      .attr('width', (d) => x(d.value) - x(0))
+      .attr('width', (d) => d3.min([x.bandwidth(), 150]))
       .attr('fill', color(true));
 
     // Transition exiting text to fade out.
     // Remove exiting nodes.
-    exit.transition(transition2).attr('fill-opacity', 0).remove();
+    exit.attr('fill-opacity', 0).remove();
 
     // Enter the new bars for the clicked-on data's parent.
     const enter = bar(svg, down, d.parent, '.exit').attr('fill-opacity', 0);
 
-    enter.selectAll('g').attr('transform', (d, i) => `translate(0,${barStep * i})`);
-
-    // Transition entering bars to fade in over the full duration.
-    enter.transition(transition2).attr('fill-opacity', 1);
+    enter.attr('fill-opacity', 1);
 
-    // Color the bars as appropriate.
-    // Exiting nodes will obscure the parent bar, so hide it.
-    // Transition entering rects to the new x-scale.
-    // When the entering parent rect is done, make it visible!
     enter
       .selectAll('rect')
       .attr('fill', (d) => color(!!d.children))
-      .attr('fill-opacity', (p) => (p === d ? 0 : null))
-      .transition(transition2)
-      .attr('width', (d) => x(d.value) - x(0))
+      .attr('height', (d) => y(0) - y(d.value))
       .on('end', function (p) {
         d3.select(this).attr('fill-opacity', 1);
       });
   }
 
-  function stack(i) {
-    let value = 0;
-    return (d) => {
-      const t = `translate(${x(value) - x(0)},${barStep * i})`;
-      value += d.value;
-      return t;
-    };
+  function zoom(svg) {
+    const extent = [
+      [margin.left, margin.top],
+      [width - margin.right, height - margin.top],
+    ];
+
+    svg.call(
+      d3.zoom().scaleExtent([1, 5]).translateExtent(extent).extent(extent).on('zoom', zoomed),
+    );
+
+    function zoomed(event, d) {
+      x.range([margin.left, width - margin.right].map((d) => event.transform.applyX(d)));
+      svg
+        .selectAll('.bars rect')
+        .attr('x', (d) => x(d.data.name))
+        .attr('width', x.bandwidth());
+      svg.selectAll('.x-axis').call(xAxis);
+    }
   }
 
-  function stagger() {
-    let value = 0;
-    return (d, i) => {
-      const t = `translate(${x(value) - x(0)},${barStep * i})`;
-      value += d.value;
-      return t;
-    };
-  }
 }
diff --git a/annotation-app/src/libs/modelChart.js b/annotation-app/src/libs/modelChart.js
index 7ebffe36..a3babfea 100644
--- a/annotation-app/src/libs/modelChart.js
+++ b/annotation-app/src/libs/modelChart.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/libs/userChart.js b/annotation-app/src/libs/userChart.js
index 5fed67fa..bd0ff00b 100644
--- a/annotation-app/src/libs/userChart.js
+++ b/annotation-app/src/libs/userChart.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/main.ts b/annotation-app/src/main.ts
index 08f4180c..52c9299f 100644
--- a/annotation-app/src/main.ts
+++ b/annotation-app/src/main.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 
diff --git a/annotation-app/src/polyfills.ts b/annotation-app/src/polyfills.ts
index efdb7901..4cf51335 100644
--- a/annotation-app/src/polyfills.ts
+++ b/annotation-app/src/polyfills.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 // This file includes polyfills needed by Angular 2 and is loaded before
diff --git a/annotation-app/src/styles.css b/annotation-app/src/styles.css
index 235ea479..781185d8 100644
--- a/annotation-app/src/styles.css
+++ b/annotation-app/src/styles.css
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2021 VMware, Inc.
+Copyright 2019-2022 VMware, Inc.
 SPDX-License-Identifier: Apache-2.0
 */
 /* You can add global styles to this file, and also import other style files */