diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
index 52fdb43..963d71b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
@@ -70,7 +70,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
     $scope.reRunSearchOnLoad = function () {
 
-        var curBodyRegion = $rootScope.getLocalStorageValue("AICurBodyId");
+        var curBodyRegion = $rootScope.getLocalStorageValue("AIImageId");
         if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null && curBodyRegion !== '') {
             $scope.query.selectedbodyregion = curBodyRegion;
         }
@@ -109,11 +109,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     };
 
     $scope.loadAllAI = function () {
+        $rootScope.isLoading = true;
         $('#aiSpinner').css('visibility', 'visible');
         $('#aiSpinner').css('zIndex', '20000');
         var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
         promise.then(
                   function (result) {
+                      
                       $scope.IllustrationData = result;
 
                       $scope.selectedAIListViewData = new jinqJs()
@@ -126,21 +128,22 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
 
                       $('#grid-view').empty();
-                      var $e1 = $('<ul><li ng-repeat="value in selectedAIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}"  title = "{{value._Title}}"  class="GridViewDataDivHeight" data-ng-click="openView($event)">'
-                              + '<div class="thumbnail" >'
+                      var $e1 = $('<ul><li ng-repeat="value in selectedAIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}"  title = "{{value._Title}}"  class="GridViewDataDivHeight" data-ng-click="AdamDetail($event)">'
+                              + '<div class="thumbnail" id= "thumbnailDiv" >'
                                          + '<img id="{{value._Title}}" ng-src="~/../content/images/ai/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >'
                                          + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view');
                       $compile($e1)($scope);
                       
                       $timeout(function () {
-                          $('#' + $rootScope.getLocalStorageValue("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail');
+                          $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).find('.thumbnail').addClass('HightLightThumbnail');
                           if ($rootScope.getLocalStorageValue('AIGridViewScroll') !== null && $location.url() == "/ADAM-images") {
                               $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AIGridViewScroll') });
                           }
                       }, 100);
 
-
-                      $timeout(function () { $('#aiSpinner').css('visibility', 'hidden'); }, 300);
+                          $rootScope.isLoading = false;
+                          $('#aiSpinner').css('visibility', 'hidden');
+                      
                   },
                   function (error) {
                       // handle errors here
@@ -201,7 +204,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
 
         //set localstorage values
-        localStorage.setItem("AICurBodyId", '');
+        localStorage.setItem("AIImageId", '');
         localStorage.setItem("AIListViewScroll", '');
 
         if ($('.selected').hasClass("selected")) { $('.selected').removeClass("selected"); }
@@ -223,21 +226,20 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
 
         $scope.filterstring = true;
-
+        $scope.searchAIListViewData = [];
         while ($scope.searchAIListViewData.length) {
             $scope.searchAIListViewData.pop();
         }
 
-
-
-        
+        filtercount = 0;
         if (typeof (SearchText) !== "undefined" && (SearchText !== null && SearchText !== "")) {
 
-            localStorage.setItem("AICurBodyId", SearchText);
+            localStorage.setItem("AIImageId", SearchText.trim());
+            filtercount = filtercount + 1;
 
         }
         else {
-            localStorage.setItem("AICurBodyId", '');
+            localStorage.setItem("AIImageId", '');
 
         }
 
@@ -256,36 +258,29 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       angular.forEach($scope.selectedAIListViewData, function (value, key) {
 
                           var selectimg = true;
-                          //var count = 0;
-
-
+                          var count = 0;
                           if (typeof (SearchText) !== "undefined" && (SearchText !== null && SearchText !== "")) {
                               var posbodyregion = value._Title.indexOf(SearchText);
                               if (posbodyregion > -1) {
                                   selectimg = true;
-                                  //count = count + 1;
+                                  count = count + 1;
 
                               }
                               else {
                                   selectimg = false;
-                                  //count = count - 1;
+                                  count = count - 1;
                               }
 
                           }
 
-                         
-
-                          if (selectimg === true ) {
-
-
+                          if (selectimg === true && count >= filtercount) {
                               $scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
 
-                              var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
+                              var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="AdamDetail($event)">'
                                   + '<div class="thumbnail" >'
                                              + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
                                              + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
 
-
                               $compile($el)($scope);
 
                               $(".sidebar").mCustomScrollbar({
@@ -297,7 +292,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               $scope.searchAIListViewData.push(
                               {
                                   "_id": value._id,
-                                  "_ImageId": value._ImageId,
                                   "_Title": value._Title,
                                   "_contentImage": value._contentImage,
                                   "_ThumbnailImage": value._ThumbnailImage,
@@ -329,12 +323,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     }
 
 
-    $scope.openView = function ($event) {
+    $scope.AdamDetail = function ($event) {
 
         $rootScope.MenuModuleName = "AI";
         $rootScope.disableAnnotationTB = false;
         $rootScope.AIAnotationIdentifyModeOff = true;
-        $rootScope.currentBodyViewId = $event.currentTarget.id;
+        $rootScope.currentAIImageId = $event.currentTarget.id;
         if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") {
             var AITitle = [];
             AITitle = new jinqJs()
@@ -348,8 +342,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
         }
 
-        localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
-        localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
+        localStorage.setItem("currentImageTitleFromJson", $rootScope.ViewTitle);
+        localStorage.setItem("currentAIImageId", $event.currentTarget.id);
 
         //Set the vertical scroll value of the Grid-View.       
         var y = $($window).scrollTop();
@@ -358,7 +352,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $location.url('/adam-images-detail');
     }
 
-    $scope.openBodyView = function () {
+    $scope.OpenAdamImageDeatail = function () {
 
         if ($rootScope.refreshcheck == null) {
             $location.path('/');
@@ -366,11 +360,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
-        $scope.voId = $rootScope.getLocalStorageValue("currentBodyViewId");
+        $scope.voId = $rootScope.getLocalStorageValue("currentAIImageId");
 
         var counter = 1;
-        var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson");
-        localStorage.setItem("currentViewTitle", tittle);
+        var tittle = $rootScope.getLocalStorageValue("currentImageTitleFromJson");
+        localStorage.setItem("currentImageTitle", tittle);
        
         var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
         promise.then(
@@ -400,7 +394,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               //ajax: {
                               //    url: 'app/views/ci/ci-view-detail.html'
                               //},
-                              title: $rootScope.getLocalStorageValue("currentViewTitle"),
+                              title: $rootScope.getLocalStorageValue("currentImageTitle"),
                               position: {
                                   top: 70,
                                   left: 20,
@@ -419,9 +413,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
                           $rootScope.currentSlug = 'adam-images-detail';
 
-                          $rootScope.openViews.push(
+                          $rootScope.AdamDetails.push(
                          {
-                             "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
+                             "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentAIImageId,
                              "slug": $rootScope.currentSlug
                          });
 
@@ -440,7 +434,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 
                );
 
-        // console.log($rootScope.openViews);
+        // console.log($rootScope.AdamDetails);
         $('#AIView').css("height", $(window).outerHeight());
 
         $('#AIView').css("width", $(window).outerWidth());
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 6f489e6..96e2d2c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1248,6 +1248,14 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
             $("#optionsListManagerTab").addClass("disableSubMenu");
             $rootScope.disableFileMenu = " ";
         }
+        else if ($location.url() == "/adam-images-detail") {
+            $rootScope.disableMenuannotation = " ";
+            $rootScope.disableMenuoption = " ";
+            $rootScope.disableSubMenu = "disableSubMenu";
+            $("#annotationToolBarOptions").removeClass("disableSubMenu");
+            $("#optionsListManagerTab").addClass("disableSubMenu");
+            $rootScope.disableFileMenu = " ";
+        }
         else if ($location.url() == "/module-item-view") {
             $rootScope.disableMenuannotation = " ";
             $rootScope.disableMenuoption = " ";
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html
index d7b2971..29ce016 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html
@@ -1,6 +1,6 @@
 <div>
     <div ng-include="aap/widget/MainMenu.html"></div>
-    <div ng-init="openBodyView()" id="AIView" class="aiView" ng-controller="AIController" style=" "></div> <!--position: absolute !important;-->
+    <div ng-init="OpenAdamImageDeatail()" id="AIView" class="aiView" ng-controller="AIController" style=" "></div> <!--position: absolute !important;-->
     
     
 </div>
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
index 8e0928a..d4b81a9 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
@@ -61,14 +61,14 @@
                             </tr>
                         </thead>
                         <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody">
-                            <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedAIListViewData">
+                            <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="AdamDetail($event)" ng-repeat="item in selectedAIListViewData">
                                 <td width="20%">
                                     {{item._Title}}
                                 </td>
                             </tr>
                         </tbody>
                         <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody">
-                            <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchAIListViewData">
+                            <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="AdamDetail($event)" ng-repeat="item in searchAIListViewData">
                                 <td width="20%">
                                     {{item._Title}}
                                 </td>
@@ -81,12 +81,12 @@
                     <div class="row well">
                         <div title="{{SelectedAITitle}}" class="col-sm-3 col-lg-2 no-padding">
                             <div class="thumbnail no-margin">
-                                <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="openView($event)">
+                                <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="AdamDetail($event)">
                             </div>
                         </div>
                         <div class="col-sm-9 col-lg-9" style="padding-left:10px;">
                             <p class="f11" ng-bind-html="SelectedCISummary"></p>
-                            <button id="{{SelectedAIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)">Open</button>
+                            <button id="{{SelectedAIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="AdamDetail($event)">Open</button>
                         </div>
                     </div>