anchor.diff:  						</html:select>
   					</td>
   					<td class="formField">
  -						<html:text styleClass="formFieldSized10" size="30" styleId="<%=attributeValue%>" property="<%=attributeValue%>" />
  -						<html:hidden property="showCalendar" />
  +						<html:text styleClass="formFieldSized10" size="30" styleId="<%=attributeValueID%>" property="<%=attributeValue%>" />
  +						<html:hidden property="<%=showCalendarValue%>" styleId="<%=showCalendarValue%>" />
   					</td>
   				<!--  ********************* MD Code ********************** -->	
  -					<td id="<%=colID%>" class="<%=dateClass%>">
  +				<!-- ***** Code added to check multiple rows for Calendar icon ***** -->
  +				<%
  +					showCal = "";
  +					dateClass = "hideTD";
  +					
  +					showCal = (String)form.getShowCalendar(showCalendarKey);
  +					if(showCal != null && showCal.trim().length()>0)
  +					{
  +						dateClass = "formField";
  +					}	
  +				%>
  +					<td id="<%=columnID%>" class="<%=dateClass%>">
   					<%	
  -						String fieldName = "simpleQueryInterfaceForm."+attributeValue;
  +						String fieldName = "simpleQueryInterfaceForm."+attributeValueID;
   					%>
   						<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
   						<a href="javascript:show_calendar('<%=fieldName%>',null,null,'MM-DD-YYYY');">
  
positive.code: 						</a>
  					</td>
  					<logic:equal name="pageOf" value="<%=Constants.PAGEOF_SIMPLE_QUERY_INTERFACE%>">
  					<td class="formSmallField">
  						<html:hidden property="<%=nextOperator%>"/>
  					</td>
  					<td class="formField">
  					  <%if (nextOperatorValue != null && (false == nextOperatorValue.equals(""))){
  							if (nextOperatorValue.equals(Constants.AND_JOIN_CONDITION))
  							{%><bean:message key="simpleQuery.and" />	
  
negative.code: 						String objectDisplayNameList = "objectDisplayNameList"+i;
  						SimpleQueryInterfaceForm form = (SimpleQueryInterfaceForm)obj;
  						String nextOperatorValue = (String)form.getValue("SimpleConditionsNode:"+i+"_Operator_operator");
  						String columnID = "calTD"+i;
  						String showCalendarKey = "SimpleConditionsNode:"+i+"_showCalendar";			
  						String showCalendarValue = "showCalendar(SimpleConditionsNode:"+i+"_showCalendar)";
  						String functionName = "showDateColumn(this,'"+ attributeValueID +"','" + columnID + "','" + showCalendarValue + "')";
  				%>					
  				<tr>
  					<td class="formRequiredNotice" width="5">&nbsp;</td>
  