anchor.diff:              <div class="value">
               
                <c:if test="${FLOW == 'EDIT_FLOW'}">
  -                    <input type="hidden" id="healthcareSite-hidden"
  -								name="healthcareSite"
  -								value="${command.healthcareSite.id }" />
  -								<input id="healthcareSite-input" size="38" type="text"
  -								value="${command.healthcareSite.name}" class="autocomplete validate-notEmpty" disabled="true" />
  -								<tags:hoverHint keyProp="researchStaff.organization"/>
  -							<tags:indicator id="healthcareSite-indicator" />
  -							<div id="healthcareSite-choices" class="autocomplete" style="display: none;"></div>
  -                </c:if>
  -                <c:if test="${FLOW == 'SAVE_FLOW'}">
  -                 <input type="hidden" id="healthcareSite-hidden"
  -								name="healthcareSite"
  -								value="${command.healthcareSite.id }" />
  -								<input id="healthcareSite-input" size="38" type="text"
  -								value="${command.healthcareSite.name}" class="autocomplete validate-notEmpty" />
  -								<tags:hoverHint keyProp="researchStaff.organization"/>
  -							<tags:indicator id="healthcareSite-indicator" />
  -							<div id="healthcareSite-choices" class="autocomplete" style="display: none;"></div>
  -                </c:if>
  +				<c:choose>
  +				<c:when test="${command.healthcareSite.class eq 'class edu.duke.cabig.c3pr.domain.RemoteHealthcareSite'}">
  +					<div>	${command.healthcareSite.name} &nbsp;<img src="<chrome:imageUrl name="nci_icon.png"/>" alt="Calendar" width="17" height="16" border="0" align="middle"/> 
  +							<tags:hoverHint keyProp="researchStaff.organization"/>	</div>
  +				</c:when>
  +				<c:otherwise>
  +					<div>	${command.healthcareSite.name}<tags:hoverHint keyProp="researchStaff.organization"/> </div>
  +				</c:otherwise>
  +				</c:choose>
  +             </c:if>
  +             <c:if test="${FLOW == 'SAVE_FLOW'}">
  +               		<input type="hidden" id="healthcareSite-hidden"
  +						name="healthcareSite"
  +						value="${command.healthcareSite.id }" />
  +						<input id="healthcareSite-input" size="38" type="text"
  +						value="${command.healthcareSite.name}" class="autocomplete validate-notEmpty" />
  +						<tags:hoverHint keyProp="researchStaff.organization"/>
  +					<tags:indicator id="healthcareSite-indicator" />
  +					<div id="healthcareSite-choices" class="autocomplete" style="display: none;"></div>
  +              </c:if>
               </div>
           </div>
       </div>
  
positive.code:             
  				<c:choose>
  					<c:when test="${command.class eq 'class edu.duke.cabig.c3pr.domain.RemoteResearchStaff'}">
  						<div class="value">${command.firstName}</div>
  					</c:when>
  					<c:otherwise>
  						<div class="value">
  
negative.code:             
  				<c:choose>
  					<c:when test="${command.class eq 'class edu.duke.cabig.c3pr.domain.RemoteResearchStaff'}">
  						<c:choose>
  							<c:when test="${!empty command.lastName}">
  								<div class="value">${command.lastName}</div>
  							</c:when>
  							<c:otherwise>
  								<div class="value"><span class="no-selection"><fmt:message key="c3pr.common.noDataAvailable"/></span></div>
  							</c:otherwise>
  						</c:choose>
  					</c:when>
  					<c:otherwise>
  						<div class="value">
  