diff --git a/src/webapps/master/WEB-INF/web.xml b/src/webapps/master/WEB-INF/web.xml
index 3fe49cdcded..8c08937f719 100644
--- a/src/webapps/master/WEB-INF/web.xml
+++ b/src/webapps/master/WEB-INF/web.xml
@@ -9,11 +9,6 @@ Automatically created by Tomcat JspC.
 <web-app>
 
 
-    <servlet>
-        <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
-        <servlet-class>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-class>
-    </servlet>
-
     <servlet>
         <servlet-name>org.apache.hadoop.hbase.generated.master.hql_jsp</servlet-name>
         <servlet-class>org.apache.hadoop.hbase.generated.master.hql_jsp</servlet-class>
@@ -24,10 +19,10 @@ Automatically created by Tomcat JspC.
         <servlet-class>org.apache.hadoop.hbase.generated.master.master_jsp</servlet-class>
     </servlet>
 
-    <servlet-mapping>
+    <servlet>
         <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
-        <url-pattern>/table.jsp</url-pattern>
-    </servlet-mapping>
+        <servlet-class>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-class>
+    </servlet>
 
     <servlet-mapping>
         <servlet-name>org.apache.hadoop.hbase.generated.master.hql_jsp</servlet-name>
@@ -39,5 +34,10 @@ Automatically created by Tomcat JspC.
         <url-pattern>/master.jsp</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
+        <url-pattern>/table.jsp</url-pattern>
+    </servlet-mapping>
+
 </web-app>
 
diff --git a/src/webapps/master/table.jsp b/src/webapps/master/table.jsp
index 76a357d3ab8..5e6d5557cf0 100644
--- a/src/webapps/master/table.jsp
+++ b/src/webapps/master/table.jsp
@@ -57,7 +57,7 @@
 <%      for(Map.Entry<HRegionInfo, HServerAddress> hriEntry : regions.entrySet()) { %>
 <%        System.out.println(serverToServerInfos.keySet().toArray()[0].toString());
           System.out.println(hriEntry.getValue().getHostname()+":"+hriEntry.getValue().getPort());
-          int infoPort = serverToServerInfos.get(hriEntry.getValue().getHostname()+":"+hriEntry.getValue().getPort()).getInfoPort();
+          int infoPort = serverToServerInfos.get(hriEntry.getValue().getBindAddress()+":"+hriEntry.getValue().getPort()).getInfoPort();
           String url = "http://" + hriEntry.getValue().getHostname().toString() + ":" + infoPort + "/";  %>
 <tr><td><%= hriEntry.getKey().getRegionName()%></td><td><a href="<%= url %>"><%= hriEntry.getValue().getHostname() %>:<%= hriEntry.getValue().getPort() %></a></td>
     <td><%= hriEntry.getKey().getEncodedName()%></td> <td><%= hriEntry.getKey().getStartKey()%></td>