anchor.diff:  						</spring:bind></td>
   				</tr>
   				<tr>
  -					<th><spring:message code="Obs.encounter" /></th>
  +					<th><openmrs:message code="Obs.encounter" /></th>
   					<td><spring:bind path="encounter">
   							<c:choose>
   								<c:when test="${obs.encounter == null}">
  -									<div dojoType="EncounterSearch" widgetId="eSearch"></div>
  -									<div dojoType="OpenmrsPopup" widgetId="encounterSelection"
  -										hiddenInputName="encounter" hiddenInputId="encounterId"
  -										searchWidget="eSearch"
  -										searchTitle='<spring:message code="Encounter.find" />'></div>
  +									<openmrs_tag:encounterField formFieldName="encounter"
  +										formFieldId="encounterId" />
   									<c:if test="${status.errorMessage != ''}">
   										<span class="error">${status.errorMessage}</span>
   									</c:if>
  
positive.code: 
  	var selectNewQuestion = function(question, answer) {
  		return function() {
  			var conceptSearch = dojo.widget.manager.getWidgetById("cSearch");
  			var codedSearch = dojo.widget.manager.getWidgetById("codedSearch");
  			var msg = new Object();
  			msg.objs = [ question ];
  			dojo.event.topic.publish(conceptSearch.eventNames.select, msg);
  
negative.code: 						</spring:bind></td>
  				</tr>
  				<tr>
  					<th><openmrs:message code="Obs.datetime" /></th>
  					<td><spring:bind path="obsDatetime">
  							<input type="text" name="${status.expression}" size="10"
  								value="${status.value}" onfocus="showCalendar(this)"
  								id="${status.expression}" />
  				(<openmrs:message code="general.format" />: <openmrs:datePattern />)
  				<c:if test="${status.errorMessage != ''}">
  								<span class="error">${status.errorMessage}</span>
  							</c:if>
  						</spring:bind></td>
  				</tr>
  				<tr>
  					<th><openmrs:message code="Obs.concept" /></th>
  					<td><spring:bind path="obs.concept">
  							<openmrs_tag:conceptField formFieldName="concept"
  								formFieldId="conceptId" excludeDatatypes="N/A"
  								initialValue="${status.editor.value.conceptId}"
  								onSelectFunction="onQuestionSelect" />
  							<div class="description" id="conceptDescription"></div>
  							<c:if test="${status.errorMessage != ''}">
  								<span class="error">${status.errorMessage}</span>
  							</c:if>
  						</spring:bind></td>
  				</tr>
  				<tr id="valueBooleanRow" class="obsValue">
  					<th><openmrs:message code="Obs.booleanAnswer" /></th>
  					<spring:bind path="valueBoolean">
  						<td><select name="${status.expression}"
  							id="valueBooleanSelect">
  								<option value=""
  									<c:if test="${status.value == null || status.value == ''}">selected</c:if>></option>
  								<option value="true"
  									<c:if test="${status.value == 'true'}">selected</c:if>><openmrs:message
  										code="general.true" /></option>
  								<option value="false"
  									<c:if test="${status.value == 'false'}">selected</c:if>><openmrs:message
  										code="general.false" /></option>
  						</select> <c:if test="${status.errorMessage != ''}">
  								<span class="error">${status.errorMessage}</span>
  							</c:if></td>
  					</spring:bind>
  				</tr>
  				<tr id="valueCodedRow" class="obsValue">
  					<th valign="top"><openmrs:message code="Obs.codedAnswer" /></th>
  					<td><spring:bind path="valueCoded">
  							<openmrs_tag:conceptField formFieldName="valueCoded"
  								formFieldId="valueCoded"
  								initialValue="${status.editor.value.conceptId}"
  								showAnswers="${obs.concept.conceptId}"
  								onSelectFunction="onAnswerSelect" />
  							<div class="description" id="codedDescription"></div>
  							<c:if test="${status.errorMessage != ''}">
  								<span class="error">${status.errorMessage}</span>
  							</c:if>
  						</spring:bind></td>
  				</tr>
  				<tr id="valueDateRow" class="obsValue">
  					<th><openmrs:message code="Obs.dateAnswer" /></th>
  					<td><spring:bind path="valueDate">
  							<input type="text" name="${status.expression}" size="10"
  								value="${status.value}" onClick="showCalendar(this)" />
  				  (<openmrs:message code="general.format" />: <openmrs:datePattern />)
  				<c:if test="${status.errorMessage != ''}">
  								<span class="error">${status.errorMessage}</span>
  							</c:if>
  						</spring:bind></td>
  				</tr>
  				<tr id="valueDatetimeRow" class="obsValue">
  					<th><openmrs:message code="Obs.datetimeAnswer" /></th>
  					<td><spring:bind path="valueDatetime">
  							<input type="text" name="${status.expression}" size="15"
  								value="${status.value}" onClick="showDateTimePicker(this)" />
  				  (<openmrs:message code="general.format" />: <openmrs:datePattern />
  							<openmrs:timePattern format="jquery" />)
  				<c:if test="${status.errorMessage != ''}">
  								<span class="error">${status.errorMessage}</span>
  							</c:if>
  						</spring:bind></td>
  				</tr>
  				<tr id="valueTimeRow" class="obsValue">
  					<th><openmrs:message code="Obs.timeAnswer" /></th>
  					<td><spring:bind path="valueTime">
  							<input type="text" name="${status.expression}" size="10"
  								value="${status.value}" onfocus="showTimePicker(this)" />
  				  (<openmrs:message code="general.format" />: <openmrs:timePattern
  								format="jquery" />)
  				<c:if test="${status.errorMessage != ''}">
  								<span class="error">${status.errorMessage}</span>
  							</c:if>
  						</spring:bind></td>
  				</tr>
  				<tr id="valueNumericRow" class="obsValue">
  					<th><openmrs:message code="Obs.numericAnswer" /></th>
  					<spring:bind path="valueNumeric">
  						<td><input type="text" name="${status.expression}"
  							value="${status.value}" size="10"
  