diff --git a/src/main/webapp/scripts/directives/linkInfoDetails.js b/src/main/webapp/scripts/directives/linkInfoDetails.js
index e548012a2..b3a1a50bd 100644
--- a/src/main/webapp/scripts/directives/linkInfoDetails.js
+++ b/src/main/webapp/scripts/directives/linkInfoDetails.js
@@ -55,6 +55,7 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', 'HelixChartV
                  */
                 showDetailInformation = function (link) {
                     if (link.targetRawData) {
+                        console.log('link', link);
                         htTargetRawData = link.targetRawData;
                         scope.linkCategory = 'UnknownLinkInfoBox';
                         for (var key in link.targetInfo) {
diff --git a/src/main/webapp/scripts/services/ServerMapDao.js b/src/main/webapp/scripts/services/ServerMapDao.js
index 064a26011..f261c5490 100644
--- a/src/main/webapp/scripts/services/ServerMapDao.js
+++ b/src/main/webapp/scripts/services/ServerMapDao.js
@@ -151,7 +151,7 @@ pinpointApp.service('ServerMapDao', [ 'serverMapDaoConfig', function ServerMapDa
      * @returns {*}
      */
     this.addFilterProperty = function (filterText, mapData) {
-        var parsedFilters = this.parseFilterText2(filterText, mapData);
+        var parsedFilters = this.parseFilterText(filterText, mapData);
 
         angular.forEach(mapData.applicationMapData.linkDataArray, function (val, key) {
             if (angular.isDefined(_.findWhere(parsedFilters, {fromKey: val.from, toKey: val.to}))) {
@@ -169,24 +169,7 @@ pinpointApp.service('ServerMapDao', [ 'serverMapDaoConfig', function ServerMapDa
      * @param mapData
      * @returns {Array}
      */
-//    this.parseFilterText = function (filterText, mapData) {
-//        var splitedFilter = filterText.split(cfg.FILTER_DELIMETER),
-//            aFilter = [];
-//        angular.forEach(splitedFilter, function (val, key) {
-//            var filter = val.split(cfg.FILTER_ENTRY_DELIMETER);
-//            aFilter.push({
-//                fromCategory: filter[0],
-//                fromText: filter[1],
-//                fromKey: this.findNodeKeyByText(filter[1], mapData),
-//                toCategory: filter[2],
-//                toText: filter[3],
-//                toKey: this.findNodeKeyByText(filter[3], mapData)
-//            });
-//        }, this);
-//        return aFilter;
-//    };
-
-    this.parseFilterText2 = function (filterText, mapData) {
+    this.parseFilterText = function (filterText, mapData) {
         var filters = JSON.parse(filterText),
             aFilter = [];
 
@@ -514,6 +497,7 @@ pinpointApp.service('ServerMapDao', [ 'serverMapDaoConfig', function ServerMapDa
                     newLink.filterApplicationName = link.filterApplicationName;
                     newLink.filterApplicationServiceTypeCode = link.filterApplicationServiceTypeCode;
                     newLink.sourceInfo = link.sourceInfo;
+                    link.targetInfo['text'] = link.text;
                     newLink.targetInfo.push(link.targetInfo);
 
                     newLink.targetRawData[link.targetInfo.applicationName] = angular.copy(link);
diff --git a/src/main/webapp/views/linkInfoDetails.html b/src/main/webapp/views/linkInfoDetails.html
index f4474f0a8..dc3917ecc 100644
--- a/src/main/webapp/views/linkInfoDetails.html
+++ b/src/main/webapp/views/linkInfoDetails.html
@@ -1,34 +1,10 @@
 <div class="linkInfoDetails" ng-show="showLinkInfoDetails">
 
-    <!--<ul class="list-unstyled" ng-if="linkCategory == 'UnknownLinkInfoBox'">-->
-        <!--<li ng-repeat="target in targetinfo">-->
-            <!--<div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"-->
-                 <!--tooltip="{{sourceInfo[0].applicationName}} → {{target.applicationName}}" tooltip-placement="bottom">-->
-                <!--<img ng-src="/images/icons/{{sourceInfo[0].serviceType | icons}}.png" style="height:14px;" />-->
-                <!--{{sourceInfo[0].applicationName}}-->
-                <!--<span class="glyphicon glyphicon-arrow-right"></span>-->
-                <!--<img ng-src="/images/icons/{{target.serviceType | icons}}.png" style="height:14px;" />-->
-                <!--{{target.applicationName}}-->
-            <!--</div>-->
-            <!--<div class="summaryCharts_{{target.sequence}}" style="position: relative;">-->
-                <!--<svg style='height:120px;width:350px;' />-->
-                <!--<a class="btn btn-default btn-xs" href ng-click="showDetailInformation(target.applicationName)"-->
-                   <!--title="Show Link Information" style="position: absolute;top: 20px; right:0;">-->
-                    <!--<span class="glyphicon glyphicon-tasks"></span>-->
-                <!--</a>-->
-                <!--<a class="btn btn-default btn-xs" href title="Filter Transaction"  style="position: absolute;top: 50px; right:0;"-->
-                   <!--ng-click="passingTransactionMap(sourceInfo[0].serviceType, sourceInfo[0].applicationName, target.serviceType, target.applicationName)">-->
-                    <!--<span class="glyphicon glyphicon-filter"></span>-->
-                <!--</a>-->
-            <!--</div>-->
-        <!--</li>-->
-    <!--</ul>-->
-
     <div ng-if="linkCategory == 'UnknownLinkInfoBox'">
 
-        <div class="panel panel-default" ng-repeat="target in targetInfo">
+        <div class="panel panel-default" ng-repeat="target in targetInfo | orderBy:'text':true">
             <div class="panel-heading" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"
-                 tooltip="{{sourceInfo.applicationName}} → {{target.applicationName}}" tooltip-placement="bottom">
+                 title="{{sourceInfo.applicationName}} → {{target.applicationName}}" data-placement="bottom" data-toggle="tooltip" >
                 <img ng-src="/images/icons/{{sourceInfo.serviceType | icons}}.png" style="height:14px;" />
                 {{sourceInfo.applicationName}}
                 <span class="glyphicon glyphicon-arrow-right"></span>
@@ -75,9 +51,5 @@
         <h5>Load</h5>
         <svg style='height:150px' />
     </div>
-    <!--<div ng-if="ShowLinkLoad" style="height:220px;">-->
-        <!--<h5>Load(Draft)</h5>-->
-        <!--<helix-chart namespace="loadForLinkInfoDetails"></helix-chart>-->
-    <!--</div>-->
 
 </div>
\ No newline at end of file