diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index b8b9f3a..e3ed62b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -4827,8 +4827,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                 };
                             }
 
+                           
+
+                            $("#termList").find("option").removeClass('currentTermActive');
+                            if(actualTermNo>0)
+                            {
+                                var TermNumber = actualTermNo+'_'+windowviewid;
+                                $("#termList").find("option[id=" + TermNumber + "]").addClass('currentTermActive');
+                            }
+                          
+
                         }
-                        
+
                     }
 
             }
@@ -11153,6 +11163,25 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                     }, 200);  
                 }                                         
               
+                 
+                $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+                var actualTermNumber=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
+            
+             if (actualTermNumber >0) {
+               
+                var pinData = new jinqJs()
+                            .from( $scope.limitTofilterdata)
+                            .where("_ActualTermNumber == " + actualTermNumber)
+                            .select();       
+                                           
+                if(pinData.length>0)
+                {
+                    var pinTermNumber = pinData[0]._ActualTermNumber+'_'+windowviewid;
+                    $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                }
+                                 
+             }
+
         }
 
         $scope.HideSearch = function () {
@@ -11361,6 +11390,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 $('#btlLoadMoreLm').attr('disabled', 'disabled');
             }
 
+            var actualTermNo=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
+            $("#termList").find("option").removeClass('currentTermActive');
+            if(actualTermNo>0)
+            {
+                var TermNumber = actualTermNo+'_'+windowviewid;
+                $("#termList").find("option[id=" + TermNumber + "]").addClass('currentTermActive');
+            }
+
             $scope.EnableDAUI(windowviewid);
             
         }
@@ -11496,6 +11533,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                   }
                      
               }
+
+              var actualTermNo=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
+              $("#termList").find("option").removeClass('currentTermActive');
+              if(actualTermNo>0)
+              {
+                  var TermNumber = actualTermNo+'_'+windowviewid;
+                  $("#termList").find("option[id=" + TermNumber + "]").addClass('currentTermActive');
+              }
+
               $scope.EnableDAUI(windowviewid);
   
         }
@@ -11537,10 +11583,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                 $scope.SetwindowStoreData(windowviewid,'isNormalMode',false);
                 $scope.SetwindowStoreData(windowviewid,'prevId',actualTermNumber);
 
-                $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
-                $("#termList").find("option[id=" + selectedtermid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
+
+                $("#termList").find("option").removeClass('currentTermActive');
+        
+                $("#termList").find("option[id=" + selectedtermid + "]").addClass('currentTermActive');
+               
                 
-                  var isListManagerSelected=true;
+                var isListManagerSelected=true;
                 $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',isListManagerSelected);
                 //---
                 if (isListManagerSelected == true) {
@@ -12005,6 +12054,27 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
              $compile($all)($scope);
 
              $("#typedTermName_" + windowviewid).attr("name", "0");
+
+             
+             $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+    
+             var actualTermNumber=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
+            
+             if (actualTermNumber >0) {
+               
+                var pinData = new jinqJs()
+                            .from( $scope.limitTofilterdata)
+                            .where("_ActualTermNumber == " + actualTermNumber)
+                            .select();                      
+            
+
+                if(pinData.length>0)
+                {
+                    var pinTermNumber = pinData[0]._ActualTermNumber+'_'+windowviewid;
+                    $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                }
+                
+             }
             
         };
        
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 32b74a5..f12e700 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -2841,6 +2841,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         }
                 
                      
+                    // highlight pin on list manager
+
+                    $("#termList").find("option").removeClass('currentTermActive');
+                    var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+                    var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+                           
+                    if (activePinArray.length >0) {
+                        for (var i = 0; i < activePinArray.length; i++) {
+                            var pinnum = activePinArray[i].split("_")[1];  
+                       
+                            var pinData = new jinqJs()
+                                          .from(aaPinData)
+                                          .where("_PinId == " + pinnum)
+                                          .select();                      
+                           
+                             var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                             $("#termList").find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                        }
+                    }
                  }
 
                
@@ -3180,6 +3199,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $('#btlLoadMoreLm').attr('disabled', 'disabled');
         }
 
+        $("#termList").find("option").removeClass('currentTermActive');
+        var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+        var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+               
+        if (activePinArray.length >0) {
+            for (var i = 0; i < activePinArray.length; i++) {
+                var pinnum = activePinArray[i].split("_")[1];  
+           
+                var pinData = new jinqJs()
+                              .from(aaPinData)
+                              .where("_PinId == " + pinnum)
+                              .select();                      
+               
+                 var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                 $("#termList").find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+            }
+        }      
+
         $scope.EnableAAUI(windowviewid);                       
         
     }
@@ -3300,6 +3337,23 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 $('#btlLoadMoreLm').attr('disabled', 'disabled');
             }
                
+            $("#termList").find("option").removeClass('currentTermActive');
+            var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+            var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+                   
+            if (activePinArray.length >0) {
+                for (var i = 0; i < activePinArray.length; i++) {
+                    var pinnum = activePinArray[i].split("_")[1];  
+               
+                    var pinData = new jinqJs()
+                                  .from(aaPinData)
+                                  .where("_PinId == " + pinnum)
+                                  .select();                      
+                   
+                     var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                     $("#termList").find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                }
+            }
         }
         $scope.EnableAAUI(windowviewid);
 
@@ -3574,9 +3628,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
 
             $('#termlistfilter_'+windowviewid).css("display", "block");
 
+            var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+
             angular.forEach($scope.limitTofilterdata, function (value2, key2) {
-                var $el = $('<option id=' +  value2._TermNumber +'_' +windowviewid+ '>' +  value2._TermText + '</option>').appendTo('#termlistfilter_' + windowviewid);
+
+                var $el = $('<option id=' +  value2._TermNumber +'_' +windowviewid+'>' +  value2._TermText + '</option>').appendTo('#termlistfilter_' + windowviewid);
                 $compile($el)($scope);
+               
             })
             
             var $all = $('#termlistfilter_'+windowviewid).appendTo('#searchListDivAA_' + windowviewid);
@@ -3587,8 +3645,26 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 $timeout(function () {
                     $('#termlistfilter_'+windowviewid).focus();
                     }, 200);  
-                }                                         
-
+                }  
+                
+                $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+                var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+               
+                if (activePinArray.length >0) {
+                    for (var i = 0; i < activePinArray.length; i++) {
+                        var pinnum = activePinArray[i].split("_")[1];  
+                   
+                        var pinData = new jinqJs()
+                                      .from(aaPinData)
+                                      .where("_PinId == " + pinnum)
+                                      .select();                      
+                       
+                         var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                        $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                    }
+                }
+                 
+        
     }
 
     $scope.resetSearchListView = function (event) {
@@ -3673,6 +3749,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
          $compile($all)($scope);
 
          $("#selectedTermName_" + windowviewid).attr("name", "0");
+
+         $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+         var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+         var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+        
+         if (activePinArray.length >0) {
+             for (var i = 0; i < activePinArray.length; i++) {
+                 var pinnum = activePinArray[i].split("_")[1];  
+            
+                 var pinData = new jinqJs()
+                               .from(aaPinData)
+                               .where("_PinId == " + pinnum)
+                               .select();                      
+                
+                  var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                 $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+             }
+         }
         
     };
 
@@ -3774,9 +3868,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         
         $scope.showAllPinsAfterHide(windowviewid);
 
-        $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
-        $("#termList").find("option[id=" + termid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
-       
+       // $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+       $("#termList").find("option").removeClass('currentTermActive');
+        $("#termList").find("option[id=" + termid + "]").addClass('currentTermActive');
+
         //get data from pindata for this trem
 
         var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
index e8859c5..8dc5086 100644
--- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
+++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -1538,17 +1538,10 @@ footer .browserIcons
     bottom: 0;
     width: 50%;
 }
-.labExModalbackground
+.currentTermActive
 {
-    background-color: black; 
-    bottom: 0px; 
-    display: none; 
-    height: 100%; left: 0px; 
-    opacity: 0.5;
-     position: fixed; 
-    right: 0px; top: 0px; 
-    width: 100%;
-     z-index: 12000000;
+    background-color: #206db9 !important; 
+   color:#ffffff !important;
 }
 #nameHelpBlock 
  {
@@ -1562,6 +1555,18 @@ footer .browserIcons
 {
      display:none;
 }
+.labExModalbackground
+{
+    background-color: black; 
+    bottom: 0px; 
+    display: none; 
+    height: 100%; left: 0px; 
+    opacity: 0.5;
+     position: fixed; 
+    right: 0px; top: 0px; 
+    width: 100%;
+     z-index: 12000000;
+}
 /*  ........Add paging bootstrap CSS...  Birendra 14/2/2020 */
 .pagination{margin:0px 0;}
 .pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}