diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 77892b4..33b75c8 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -8020,38 +8020,53 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
 
     $scope.HighlightBodyOnListManagerSelection = function (event) {
+        //	Terms search in the Search list should be disable in the List Manager and Vice-Versa.
+        if ($rootScope.prevId == event.currentTarget.id) {
 
-        $scope.terminateCurrentlyRunningWPs();
-        //debugger
-        $rootScope.isListManagerSelected = true;
-        //---
-        if ($rootScope.isListManagerSelected == true) {
-            $("#btnHighLight").addClass("btn-primary");
-            $("#btnHighLight").removeClass("btn-black");
-            if (!$("#btnNormalMode").hasClass("btn-black")) {
-                $("#btnNormalMode").addClass("btn-black");
-            }
+            $rootScope.isLoading = false;
+            $('#spinner').css('visibility', 'hidden');
+        }
+        else {
+            $rootScope.prevId = event.currentTarget.id;
+            $("#termList").find("option").attr('selected', false);
+            $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+            $("#termList").find("option[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
+            $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
+            $("div#backdrop #termlistfilter li").find("a[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
+            $scope.terminateCurrentlyRunningWPs();
+            //debugger
+            $rootScope.isListManagerSelected = true;
+            //---
+            if ($rootScope.isListManagerSelected == true) {
+                $("#btnHighLight").addClass("btn-primary");
+                $("#btnHighLight").removeClass("btn-black");
+                if (!$("#btnNormalMode").hasClass("btn-black")) {
+                    $("#btnNormalMode").addClass("btn-black");
+                }
 
-            if ($("#btnNormalMode").hasClass("btn-primary")) {
-                $("#btnNormalMode").removeClass("btn-primary");
+                if ($("#btnNormalMode").hasClass("btn-primary")) {
+                    $("#btnNormalMode").removeClass("btn-primary");
+                }
             }
-        }
-        //---
-        $rootScope.isLoading = true;
+            //---
+            $rootScope.isLoading = true;
 
-        $('#spinner').css('visibility', 'visible');
+            $('#spinner').css('visibility', 'visible');
 
-        $rootScope.isHighlightBodyByBodySystem = false;
+            $rootScope.isHighlightBodyByBodySystem = false;
 
-        //1.
-        $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value;
-        console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber)
+            //1.
+            $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value;
+            console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber)
 
-        //2.
+            //2.
 
-        $scope.setLayerNumberAndHighlightByTermList();
+            $scope.setLayerNumberAndHighlightByTermList();
 
 
+        }
+       
+
     }
 
     $scope.setLayerNumberAndHighlightByTermList = function () {