diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 6ba42eb..6261663 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1502,7 +1502,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 }
 
                 //  $rootScope.previousHighlightList.push(RGBColor);
-               // $scope.isClickedOnBodyForHighlight = true;
+                $scope.isClickedOnBodyForHighlight = true;
                 $scope.highLightBodyBasedOnIcolor(RGBColor);
             }
 
@@ -1510,9 +1510,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //extarct clicked body part is extarct button is already enabled.
 
             if ($rootScope.isExtract == true) {
-                //if ($rootScope.multiAnnotationIsON == false) {
-                //    $rootScope.isListManagerSelected = false;
-                //}
+                if ($rootScope.multiAnnotationIsON == false) {
+                    $rootScope.isListManagerSelected = false;
+                }
                 $scope.enableExtract(false);
             }
 
@@ -1884,7 +1884,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 if (maskCanvasId.match('modestyImg') && RGBColor != '000000') { }
                 else
                 {
-                  //$scope.isClickedOnBodyForHighlight = true;
+                    $scope.isClickedOnBodyForHighlight = true;
                     $scope.highLightBodyBasedOnIcolor(RGBColor);
                 }
 
@@ -1893,9 +1893,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             
             //extarct clisked body part is extarct button is already enabled.
             if ($rootScope.isExtract == true) {
-                //if ($rootScope.multiAnnotationIsON == false) {
-                //    $rootScope.isListManagerSelected = false;
-                //}
+                if ($rootScope.multiAnnotationIsON == false) {
+                    $rootScope.isListManagerSelected = false;
+                }
                 $scope.enableExtract(false);
             }
 
@@ -2141,7 +2141,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         var selectedAnnotation;
 
         if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)
-             && $rootScope.isListManagerSelected) {
+             && $rootScope.isListManagerSelected && $rootScope.multiAnnotationIsON == true) {
 
             multiTermList = $scope.AllTerms;
             angular.forEach($rootScope.previousHighlightList, function (value, key) {
@@ -2508,8 +2508,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
                     console.log('before worker call BRID: ' + bodyRegionId)
 
-                    if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null) {
-                        //if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null && TermList != undefined && TermList.length > 0) {
+                    //if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null) {
+                        if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null && TermList != undefined && TermList.length > 0) {
                         worker.postMessage({
 
                             'termList': TermList,
@@ -2521,10 +2521,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
                         });
                     }
-                    //else {
-                    //      $('#spinner').css('visibility', 'hidden')
-                    //    $rootScope.isLoading = false;
-                    //}
+                    else {
+                          $('#spinner').css('visibility', 'hidden')
+                        $rootScope.isLoading = false;
+                    }
 
 
                     worker.onmessage = function (e) {
@@ -2582,21 +2582,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                 if ($rootScope.isListManagerSelected == true) {
                                     $scope.aligneCanvasWithTerm();
                                 }
-                                //else if ($rootScope.previousHighlightList != undefined && $rootScope.previousHighlightList.length > 0 && ($scope.isGenderChnage == true || $scope.isViewChange == true)) {
-                                //    var canvasDiv = document.getElementById('canvasDiv');
-                                //    if ($rootScope.viewOrientationId == '1' || $rootScope.viewOrientationId == '4') {
-
-                                //        $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
-                                //        var canvasDiv = document.getElementById('canvasDiv');
-                                //        $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
-                                //    }
-                                //    else {
-                                //    $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
-                                //    $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
-                                //    $rootScope.isLoading = false;
-                                //}
-                                //    $('#spinner').css('visibility', 'hidden');
-                                //}
+                                else if ($rootScope.previousHighlightList != undefined && $rootScope.previousHighlightList.length > 0 && ($scope.isGenderChnage == true || $scope.isViewChange == true)) {
+                                    var canvasDiv = document.getElementById('canvasDiv');
+                                    if ($rootScope.viewOrientationId == '1' || $rootScope.viewOrientationId == '4') {
+
+                                        $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
+                                        var canvasDiv = document.getElementById('canvasDiv');
+                                        $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
+                                    }
+                                    else {
+                                    $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
+                                    $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
+                                    $rootScope.isLoading = false;
+                                }
+                                    $('#spinner').css('visibility', 'hidden');
+                                }
                                 //else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true || $scope.isClickedOnBodyForHighlight
                                 //   )
                                 else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true){
@@ -6996,12 +6996,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                      $scope.setLayerNumberAndHighlightByTermList();
 
                  }
-                 //else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&
-                 //    ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) {
+                 else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&
+                     ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) {
 
-                 //    $rootScope.isHighLight = true
-                 //    $scope.setLayerNumberAndHighlightByTermList();
-                 //}
+                     $rootScope.isHighLight = true
+                     $scope.setLayerNumberAndHighlightByTermList();
+                 }
 
                  else {
 
@@ -7066,11 +7066,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.layerNumber = 0;
 
         //remove existing body view
-        //var canDiv = document.getElementById('canvasDiv');
-        //var canDivChildCount = canDiv.childElementCount;
-        //if (canDivChildCount > 0) {
-        //      canDiv.innerHTML = '';
-        //}
+        var canDiv = document.getElementById('canvasDiv');
+        var canDivChildCount = canDiv.childElementCount;
+        if (canDivChildCount > 0) {
+              canDiv.innerHTML = '';
+        }
 
         var selectedViewId = $scope.bodyViews[event.currentTarget.title];
         $rootScope.viewOrientationId = selectedViewId;