diff --git a/gateway-service-yarn-rm/src/main/resources/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml b/gateway-service-yarn-rm/src/main/resources/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml
index b82f106..3081de0 100644
--- a/gateway-service-yarn-rm/src/main/resources/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml
+++ b/gateway-service-yarn-rm/src/main/resources/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml
@@ -70,7 +70,7 @@
         <content type="*/json">
         	<buffer path="$.apps.app[*]">
         		<detect path="$.trackingUI" value="History">
-					<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlHistory/outbound"/>
+					<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
 				</detect>
 				<detect path="$.trackingUI" value="ApplicationMaster">
 					<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
@@ -82,7 +82,7 @@
         <content type="*/xml">
         	<buffer path="/apps/app">
         		<detect path="trackingUI" value="History">
-					<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlHistory/outbound"/>
+					<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
 				</detect>
 				<detect path="trackingUI" value="ApplicationMaster">
 					<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
@@ -97,7 +97,7 @@
         <content type="*/json">
         	<buffer path="$.app">
 	       		<detect path="$.trackingUI" value="History">
-	       			<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlHistory/outbound"/>
+	       			<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
 	       		</detect>
 	       		<detect path="$.trackingUI" value="ApplicationMaster">
 	       			<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
@@ -109,7 +109,7 @@
         <content type="*/xml">
         	<buffer path="/app">
 	       		<detect path="trackingUI" value="History">
-	       			<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlHistory/outbound"/>
+	       			<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
 	       		</detect>
 	       		<detect path="trackingUI" value="ApplicationMaster">
 	       			<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
index 4ab1dfd..63b174c 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
@@ -2107,6 +2107,7 @@
         .contentType( contentType )
         .content( "apps.app[0].trackingUrl", isEmptyString() )
         .content( "apps.app[1].trackingUrl", startsWith( "http://" + gatewayAddress.getHostName() + ":" + gatewayAddress.getPort() + "/" ) )
+        .content( "apps.app[2].trackingUrl", isEmptyString() )
         .content( "apps.app[0].amContainerLogs", isEmptyString() )
         .content( "apps.app[1].amContainerLogs", isEmptyString() )
         .content( "apps.app[0].amHostHttpAddress", isEmptyString() )
diff --git a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json
index e6bd1f8..dc95157 100644
--- a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json
+++ b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json
@@ -55,8 +55,9 @@
 				"state":"FAILED",
 				"finalStatus":"FAILED",
 				"progress":0.0,
-				"trackingUI":"UNASSIGNED",
-				"diagnostics":"Application application_1399541193872_0009 submitted by user hdfs to unknown queue: a1",
+				"trackingUI":"History",
+        "trackingUrl":"http://localhost:8088/cluster/app/application_1409008107556_0001",
+        "diagnostics":"Application application_1399541193872_0009 submitted by user hdfs to unknown queue: a1",
 				"clusterId":1399541193872,
 				"applicationType":"MAPREDUCE",
 				"applicationTags":"",
diff --git a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml
index 731c99c..ad11446 100644
--- a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml
+++ b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml
@@ -70,8 +70,9 @@
 		<state>FAILED</state>
 		<finalStatus>FAILED</finalStatus>
 		<progress>0.0</progress>
-		<trackingUI>UNASSIGNED</trackingUI>
-		<diagnostics>Application application_1399541193872_0009 submitted by user hdfs to unknown queue: a1</diagnostics>
+		<trackingUI>History</trackingUI>
+    <trackingUrl>http://localhost:8088/cluster/app/application_1409008107556_0001</trackingUrl>
+    <diagnostics>Application application_1399541193872_0009 submitted by user hdfs to unknown queue: a1</diagnostics>
 		<clusterId>1399541193872</clusterId>
 		<applicationType>MAPREDUCE</applicationType>
 		<applicationTags></applicationTags>