anchor.diff:  
   --%>
   
  -<%@page import="org.opennms.web.enlinkd.EnLinkdElementFactory"%>
  -<%@page import="org.opennms.web.enlinkd.EnLinkdElementFactoryInterface"%>
  +<%@page import="java.util.Collection"%>
  +<%@page import="org.opennms.core.utils.WebSecurityUtils"%>
  +<%@page import="org.opennms.netmgt.model.OnmsNode"%>
  +<%@page import="org.opennms.web.element.ElementNotFoundException"%>
  +<%@page import="org.opennms.web.element.NetworkElementFactory"%>
  +<%@page import="org.opennms.web.element.NetworkElementFactoryInterface"%>
   <%@page import="org.opennms.web.enlinkd.BridgeLinkNode"%>
  -<%@page import="org.opennms.web.enlinkd.NodeLinkBridge"%>
  +<%@page import="org.opennms.web.enlinkd.BridgeLinkRemoteNode"%>
   <%@page import="org.opennms.web.enlinkd.BridgeLinkSharedHost"%>
  -<%@page import="org.opennms.web.enlinkd.BridgeLinkRemoteNode"%>
  -<%@page import="org.opennms.web.enlinkd.LldpLinkNode"%>
   <%@page import="org.opennms.web.enlinkd.CdpLinkNode"%>
  -<%@page import="org.opennms.web.enlinkd.OspfLinkNode"%>
  -<%@page import="org.opennms.web.enlinkd.IsisLinkNode"%>
  -<%@page
  -	language="java"
  -	contentType="text/html"
  -	session="true"
  -	import="
  -		java.net.*,
  -		java.util.*,
  -		org.springframework.web.context.WebApplicationContext,
  -		org.springframework.web.context.support.WebApplicationContextUtils,
  -		org.opennms.core.utils.InetAddressUtils,
  -		org.opennms.netmgt.model.OnmsNode,
  -		org.opennms.core.utils.WebSecurityUtils,
  -		org.opennms.web.element.*,
  -		org.opennms.web.api.Authentication
  -	"
  -%>
  +<%@ page import="org.opennms.web.enlinkd.EnLinkdElementFactory" %>
  +<%@ page import="org.opennms.web.enlinkd.EnLinkdElementFactoryInterface" %>
  +<%@ page import="org.opennms.web.enlinkd.IsisLinkNode" %>
  +<%@ page import="org.opennms.web.enlinkd.LldpLinkNode" %>
  +<%@ page import="org.opennms.web.enlinkd.NodeLinkBridge" %>
  +<%@ page import="org.opennms.web.enlinkd.OspfLinkNode" %>
   
   <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
   <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
   <%@taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
   
  -
   <%
  -    NetworkElementFactoryInterface factory = NetworkElementFactory.getInstance(getServletContext());
  -    EnLinkdElementFactoryInterface enlinkdfactory = EnLinkdElementFactory.getInstance(getServletContext());
  -
  -    String nodeIdString = request.getParameter( "node" );
  -
  +    final NetworkElementFactoryInterface factory = NetworkElementFactory.getInstance(getServletContext());
  +    final EnLinkdElementFactoryInterface enlinkdfactory = EnLinkdElementFactory.getInstance(getServletContext());
  +
  +    final String nodeIdString = request.getParameter( "node" );
       if( nodeIdString == null ) {
           throw new org.opennms.web.servlet.MissingParameterException( "node" );
       }
  -
  -    int nodeId = WebSecurityUtils.safeParseInt( nodeIdString );
  +    final int nodeId = WebSecurityUtils.safeParseInt( nodeIdString );
   
       //get the database node info
  -    OnmsNode node_db = factory.getNode( nodeId );
  +    final OnmsNode node_db = factory.getNode( nodeId );
       if( node_db == null ) {
   		throw new ElementNotFoundException("No such node in database", "node", "element/linkednode.jsp", "node", "element/nodeList.htm");
       }
   
  +	pageContext.setAttribute("nodeId", nodeId);
  +	pageContext.setAttribute("nodeLabel", node_db.getLabel());
  +
  +	Collection<LldpLinkNode> lldpLinks = enlinkdfactory.getLldpLinks(nodeId);
  +	Collection<BridgeLinkNode> bridgelinks = enlinkdfactory.getBridgeLinks(nodeId);
  +	Collection<CdpLinkNode> cdpLinks = enlinkdfactory.getCdpLinks(nodeId);
  +	Collection<NodeLinkBridge> nodelinks = enlinkdfactory.getNodeLinks(nodeId);
  +	Collection<OspfLinkNode> ospfLinks = enlinkdfactory.getOspfLinks(nodeId);
  +	Collection<IsisLinkNode> isisLinks = enlinkdfactory.getIsisLinks(nodeId);
   %>
  -
  -<% pageContext.setAttribute("nodeId", nodeId); %>
  -<% pageContext.setAttribute("nodeLabel", node_db.getLabel()); %>
   
   <jsp:include page="/includes/bootstrap.jsp" flush="false" >
     <jsp:param name="headTitle" value="${nodeLabel}" />
  
positive.code: 
  <div class="panel panel-default">
  <%
     if (enlinkdfactory.getOspfLinks(nodeId).isEmpty()) {
  %>
  	<div class="panel-heading">
  		<h3 class="panel-title">No OSPF Nbr Links found on <%=node_db.getLabel()%> by Enhanced Linkd</h3>
  	</div>
  <% } else { %>
    <div class="panel-heading">
      <h3 class="panel-title"><%=node_db.getLabel()%> OSPF Nbr Table Links found by Enhanced Linkd</h3>
  	</div>
  		<!-- Link box -->
  		<table class="table table-condensed">
  
negative.code: 			</tr>
  		</thead>
  				
  		<% for( IsisLinkNode isislink : isisLinks) { %>
  	    <tr>
  		    <td><%=isislink.getIsisCircIfIndex()%></td>
  		    <td><%=isislink.getIsisCircAdminState()%></td>
  