diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index b1d29b8..43d699c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -148,6 +148,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
         $scope.currentTitleFromJson;
         $scope.showTabButton = false;
 
+        
+       
+
+
         $scope.IsVisible = function () {
             $scope.scroll();
 
@@ -2060,7 +2064,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
                 var canvasDiv = document.getElementById('canvasDiv');
                 $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
                 if ($scope.isLayerChange == true) {
-                    $scope.isLayerChange = false;
+                    $scope.isLayerChange = false; 
                 }
 
                 if (evt.ctrlKey) {
@@ -3021,7 +3025,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
 
 
         $scope.HighlightBodyByTermListForBodySystem = function (TermList) {
-
+           
             $scope.isScrolledToHighlightedBR = false;
             //disable the background till the system gets highlighted.     
             $scope.DisableUI();
@@ -3400,7 +3404,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
             var annotationText;
             var annotation = [];
             //0
-            var figLeafTermNo = 5868; // to do declare constant for this
+            var figLeafTermNo = 5868; 
 
             if (parseInt(termNumber) != parseInt(figLeafTermNo)) {
                 $scope.TermNumber = termNumber;
@@ -4953,8 +4957,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
 
                 var tranparencyLayer;
 
-                var currentLayer = $scope.layerNumberBeforeTBDraw;
-
+                var currentLayer = $scope.layerNumberBeforeTBDraw; 
                 if (currentLayer == $rootScope.totalLayers) {
 
                     tranparencyLayer = currentLayer;
@@ -8506,32 +8509,33 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
             if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
                 $(".custom-tooltip").toggle();
             }
+            //START BUG#22814
+            // Here updating structureDropdown with the mapped values only on the basis of BodyViewID 
+
+            var systemNumberByViewID = new jinqJs()
+                                       .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
+                                       .distinct('_SystemNumber')
+                                       .orderBy([{ field: '_SystemNumber', sort: 'asc' }])
+                                       .select('_SystemNumber');
+               
+             
+            $('#structureDropdown').html("");
             var currentBodyViewId = $rootScope.voId;
-            var systemListHtml = '<ul class="dropdown-menu" aria-labelledby="dropdownMenu2"><li><a href="#" title="Current Structure">Current Structure</a></li>  <li role="separator" class="divider"></li>'
+            var systemListHtml = '<li><a href="#" title="Current Structure">Current Structure</a></li>  <li role="separator" class="divider"></li>'
             var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
 
             angular.forEach(systemList, function (value, key) {
-
-                systemListHtml = systemListHtml + '<li><a href="#" id="' + value._BodySystemId + '"  title="' + value._Name + '">' + value._Name + '</a></li>'
+                angular.forEach(systemNumberByViewID, function (valueSystemNumber, keySystemNumber) {
+                    if (value._BodySystemId == valueSystemNumber._SystemNumber) {
+                        systemListHtml = systemListHtml + '<li><a href="#" id="' + value._BodySystemId + '"  title="' + value._Name + '" onclick="OnBodySystemSelection(event)">' + value._Name + '</a></li>'
+                    }
+                })
             })
 
-            systemListHtml = systemListHtml + '</ul>';
-            $('#bodySystem').append(systemListHtml);
-
-
-            // var bodySystemDataPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_body_system_term_' + currentBodyViewId + '.json';
-            // DataService.getJson(bodySystemDataPath)
-            //.then(
-            // function (result) {
-
-            //     $rootScope.BodySystemData = result;
-
-            // },
-            // function (error) {
-            //     console.log(error.statusText)
-            // }
-            // )
+            systemListHtml = systemListHtml;
 
+            //END BUG#22814
+            $('#structureDropdown').append(systemListHtml);
         }
 
         $scope.GetBodySystemData = function (currentBodyViewId) {
@@ -9891,7 +9895,7 @@ function OnViewChange(event) {
 function OnBodySystemSelection(event) {
     console.log('OnBodySystem chnaged is called outside ');
     var scope = angular.element(document.getElementById("daView")).scope();
-
+    
 
     scope.$apply(function () {
         scope.HighlightBodyByBodySystem(event);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
index 061e354..478fd7e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -169,40 +169,7 @@
                 <div class="col-xs-6 dropdown hover-tool">
                     <div class="custom-tooltip">Highlight Options</div>
                     <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" ng-click="LoadBodySystemData($event)"><img src="content/images/icon-highlight.png" alt="" title=""></button>
-                    <ul class="dropdown-menu" id="structureDropdown">
-                        <li ng-class="CurrentStructure">
-                            <a href="#" title="Current Structure"
-                               onclick="OnBodySystemSelection(event)">Current Structure</a>
-                        </li>
-
-
-                        <li role="separator" class="divider"></li>
-                        <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
-                        <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
-                        <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodyByBodySystem($event)">Endocrine</a></li>
-                        <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodyByBodySystem($event)">Immune</a></li>
-                        <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" ng-click="HighlightBodyByBodySystem($event)">Integumentary</a></li>
-                        <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodyByBodySystem($event)">Lymphatic</a></li>
-                        <li ng-class="Muscular"><a href="#" title="Muscular" id="7" ng-click="HighlightBodyByBodySystem($event)">Muscular</a></li>
-                        <li ng-class="Nervous"><a href="#" title="Nervous" id="8" ng-click="HighlightBodyByBodySystem($event)">Nervous</a></li>
-                        <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodyByBodySystem($event)">Reproductive</a></li>
-                        <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodyByBodySystem($event)">Respiratory</a></li>
-                        <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodyByBodySystem($event)">Skeletal</a></li>
-                        <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodyByBodySystem($event)">Urinary</a></li>-->
-
-                        <li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" onclick="OnBodySystemSelection(event)">Cardiovascular</a></li>
-                        <li ng-class="Digestive"><a href="#" title="Digestive" id="2" onclick="OnBodySystemSelection(event)">Digestive</a></li>
-                        <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" onclick="OnBodySystemSelection(event)">Endocrine</a></li>
-                        <li ng-class="Immune"><a href="#" title="Immune" id="4" onclick="OnBodySystemSelection(event)">Immune</a></li>
-                        <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" onclick="OnBodySystemSelection(event)">Integumentary</a></li>
-                        <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" onclick="OnBodySystemSelection(event)">Lymphatic</a></li>
-                        <li ng-class="Muscular"><a href="#" title="Muscular" id="7" onclick="OnBodySystemSelection(event)">Muscular</a></li>
-                        <li ng-class="Nervous"><a href="#" title="Nervous" id="8" onclick="OnBodySystemSelection(event)">Nervous</a></li>
-                        <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" onclick="OnBodySystemSelection(event)">Reproductive</a></li>
-                        <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" onclick="OnBodySystemSelection(event)">Respiratory</a></li>
-                        <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" onclick="OnBodySystemSelection(event)">Skeletal</a></li>
-                        <li ng-class="Urinary"><a href="#" title="Urinary" id="12" onclick="OnBodySystemSelection(event)">Urinary</a></li>
-                    </ul>
+                    <ul class="dropdown-menu" id="structureDropdown"></ul>
                 </div>
             </div>