diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 8595e90..786ed1b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1451,6 +1451,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
         $scope.DrawMirroredImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) {
 
+            $scope.DisableUI();
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
 
@@ -1787,7 +1788,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                     //
 
                     //   console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
-
+                   
                     if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
 
                         if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
@@ -1805,9 +1806,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                         else {
                             $scope.isEligibleForHighlight = false;
                         }
-
+                     
                         if ($scope.isEligibleForHighlight == true) {
-                      
+                            $scope.DisableUI();
                             if ($scope.isSearchDataLoaded) {
                                 $rootScope.isLoading = false;
                                 $('#spinner').css('visibility', 'hidden');
@@ -1834,6 +1835,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                         else {
                             $rootScope.isLoading = false;
                             $('#spinner').css('visibility', 'hidden');
+                            //debugger;
                             $scope.EnableUI();
                         }
                     }
@@ -1867,7 +1869,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
         }
 
         $scope.DrawImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) {
-
+            $scope.DisableUI();
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
 
@@ -2209,7 +2211,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                         }
                         //
 
-
+                       
                         if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
 
                             if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
@@ -2228,9 +2230,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                 $scope.isEligibleForHighlight = false;
                             }
 
-
                             if ($scope.isEligibleForHighlight == true) {
-
+                                $scope.DisableUI();
                                 if ($scope.isSearchDataLoaded) {
                                     $rootScope.isLoading = false;
                                     $('#spinner').css('visibility', 'hidden');
@@ -2263,12 +2264,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                 else {
                                     $rootScope.isLoading = false;
                                     $('#spinner').css('visibility', 'hidden');
+                                    //debugger;
                                     $scope.EnableUI();
                                 }
                             }
                             else {
                                 $rootScope.isLoading = false;
                                 $('#spinner').css('visibility', 'hidden');
+                                //debugger;
                                 $scope.EnableUI();
                             }
                         }
@@ -2560,7 +2563,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                                 if ($scope.doAligneCanvasWithTerm == true) {
                                     $scope.aligneCanvasWithTerm();
-
+                                    //debugger;
                                     $scope.EnableUI();
                                 }
 
@@ -2848,7 +2851,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                     $rootScope.isLoading = false;
 
                                     $('#spinner').css('visibility', 'hidden');
-
+                                    //debugger;
                                     $scope.EnableUI();
 
                                 }
@@ -2929,7 +2932,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                            $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
                            $("#daMessageModal").modal('show');
-
+                           //debugger;
                            $scope.EnableUI();
 
                            $('.ui-slider').slider('enable');
@@ -3127,6 +3130,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                                    $rootScope.isLoading = false;
                                                    
                                                    //document.getElementById("daView").style.pointerEvents = "auto";
+                                                   //debugger;
                                                    //$('.ui-slider').slider('enable');
                                                    $scope.EnableUI();
                                                    prevBRID = TermExistInBodyRegionId;
@@ -3139,7 +3143,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                    else {
                                        $('#spinner').css('visibility', 'hidden')
                                        $rootScope.isLoading = false;
-
+                                       //debugger;
                                        $scope.EnableUI();
                                        $('.ui-slider').slider('enable');
                                    }
@@ -4596,6 +4600,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                             }
 
                         }
+                        else {
+                            //when user draw TB outside body than no bodyRegion
+                            //is covred and nothing is drawn so the function is not called in which we are enabling UI
+                            $scope.EnableUI();
+                        }
                     })
 
                     //for modesty
@@ -5374,7 +5383,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
 
             }
-
+            //debugger;
             $scope.EnableUI();
         }
 
@@ -7312,7 +7321,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
                                                 //for highlight when highlight button is clicked the ui got disabled,
                                                 //now highlight is completed so enalbe UI
+                                                //debugger;
                                                 $scope.EnableUI();
+
                                             }
 
                                         }
@@ -7342,6 +7353,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                     else {
                                         $scope.isLoading = false;
                                         $('#spinner').css('visibility', 'hidden');
+                                        //debugger;
                                         $scope.EnableUI();
                                     }
                                 }
@@ -7481,6 +7493,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                             else {
                                 $scope.isLoading = false;
                                 $('#spinner').css('visibility', 'hidden');
+                                //debugger;
                                 $scope.EnableUI();
 
                             }
@@ -9342,53 +9355,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
         }
 
         $scope.resetSearchListView = function () {
-            $("#termlistfilter").css("display", "block");
-            //Remove the list and then Repopulate it on change of $scope.searchFilter
-            $('#searchListDiv').empty();
-            $rootScope.ModifiedsearchListArray = [];
-            // added the timeout to delay the compile of ul li
-            $scope.IsSearchVisible = true;
-            var isValueMatchedWithTerm = false;
-            for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {
-                var searchFieldVal = $("#typedTermName").val();
-                if (searchFieldVal.length > 0) {
-                    for (var j = 0; j <= searchFieldVal.length - 1; j++) {
-                        if ($rootScope.searchListArray[i].name[j] == undefined) {
-                            isValueMatchedWithTerm = false;
-                            break;
-                        }
-                        if (searchFieldVal[j].toLowerCase() != $rootScope.searchListArray[i].name[j].toLowerCase()) {
-                            isValueMatchedWithTerm = false;
-                            break;
-                        }
-                        else {
-                            isValueMatchedWithTerm = true;
-                        }
-                    }
-                    if (isValueMatchedWithTerm == true) {
-                        $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id });
-                    }
-                }
-            }
-            var termListFilterHtml = '';
-            termListFilterHtml += '<ul id="termlistfilter"  class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;z-index:60001;">';
-            if ($("#typedTermName").val().length > 0) {
-                for (var i = 0; i <= $rootScope.ModifiedsearchListArray.length - 1; i++) {
-                    termListFilterHtml += '<li><a id=' + $rootScope.ModifiedsearchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.ModifiedsearchListArray[i].name + '</a></li>';
-                }
-                termListFilterHtml += '</ul>';
-                $('#searchListDiv').append(termListFilterHtml);
-            }
-            else {
-                for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {
-                    termListFilterHtml += '<li><a id=' + $rootScope.searchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.searchListArray[i].name + '</a></li>';
-                }
-                termListFilterHtml += '</ul>';
-                $('#searchListDiv').append(termListFilterHtml);
-            }
-        }
-    
 
+            $scope.ShowSearch();         
+        }
 
     }])
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index 0a27b5c..6ee86b4 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -420,11 +420,6 @@ AIA.constant("UserTypeConstants", {
     "SITE_USER": "Site User"
 })
 
-AIA.constant("AIAConstants", {
-
-    "NO_BODY_SYSTEM_AVAILABLE": "No body system available in this layer.",
-
-})
 
 AIA.constant("UserModules", [
     {