diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index d9bd8a0..b60f013 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -5060,36 +5060,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //2.
             $scope.terminateCurrentlyRunningWPs();
 
-            //3.
-            //if extarct is alraedy enabled and user cliked on any body part then extract that.
-            if (isCalledFromButton == false) {
-
-                $rootScope.isExtract = true;
-                //disable transparency button
-
-                $("#btnTranparency").addClass("disabled");
-
-
-                if ($rootScope.isNormalMode == true) {
-
-                    $rootScope.isHighLight = false;
-                    $rootScope.isNormalMode = false;
-                }
-                else {
-
-                    $rootScope.isHighLight = false;
-                }
-
-                //4.
-                console.log('highLightBody from enableExtract')
-                $scope.highLightBody();
-
-            }
-            else {
-                if ($rootScope.isExtract == true) {
+                //3.
+                //if extarct is alraedy enabled and user cliked on any body part then extract that.
+                if (isCalledFromButton == false) {
 
-                }
-                else {
                     $rootScope.isExtract = true;
                     //disable transparency button
 
@@ -5110,9 +5084,37 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     console.log('highLightBody from enableExtract')
                     $scope.highLightBody();
 
+                }
+                else {
+
+                    if ($rootScope.isExtract == true) {
 
+                    }
+                    else {
+                        $rootScope.isExtract = true;
+                        //disable transparency button
+
+                        $("#btnTranparency").addClass("disabled");
+
+
+                        if ($rootScope.isNormalMode == true) {
+
+                            $rootScope.isHighLight = false;
+                            $rootScope.isNormalMode = false;
+                        }
+                        else {
+
+                            $rootScope.isHighLight = false;
+                        }
+
+                        //4.
+                        console.log('highLightBody from enableExtract')
+                        $scope.highLightBody();
+
+
+                    }
                 }
-            }
+            
 
             //5. unhighlight other
             //$scope.Normal = "";
@@ -5626,6 +5628,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             localStorage.setItem("currentBodyViewId", currentBodyViewId);
 
             //3.
+            $scope.layerNumber = 0;
             $scope.loadSelectedBodyView(currentBodyViewId);
 
             //4.
@@ -5653,6 +5656,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             localStorage.setItem("currentBodyViewId", currentBodyViewId);
 
             //3.
+            $scope.layerNumber = 0;
             $scope.loadSelectedBodyView(currentBodyViewId);
 
             //4.
@@ -7062,7 +7066,31 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             console.log('highLightBody from HighlightBodyByBodySystem')
             $scope.highLightBody();
         }
+        else {
+            //This else is when user seraced anything then change the view and clicked on highlight options 
+            //in this case body is already highlihted(gray) so no need to 
+            if ($scope.grayedBR != null || $scope.grayedBR != undefined) {
+                if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.grayedBR.length == 9)) {
+                    $scope.isAlreadyHighlighted = true;
+                }
+                else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.grayedBR.length == 5)) {
+                    $scope.isAlreadyHighlighted = true;
+                }
+                else if ((($rootScope.viewOrientationId == '5')) && ($scope.grayedBR.length == 4)) {
+                    $scope.isAlreadyHighlighted = true;
+                }
+                else if ((($rootScope.viewOrientationId == '6')) && ($scope.grayedBR.length == 1)) {
+                    $scope.isAlreadyHighlighted = true;
+                }
+                if (($scope.isAlreadyHighlighted == true && $rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined && $scope.systemMatchedTermList.length > 0)) {
+
+                    $scope.isLoading = true;
 
+                    $('#spinner').css('visibility', 'visible');
+                    $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100);
+                }
+            }
+        }
 
 
         //$rootScope.isLoading = true;