anchor.diff:  			<aui:form action="<%= searchURL %>" method="post" name="fm">
   				<div class="toolbar_search_input">
   					<c:choose>
  -						
   						<c:when test="<%= tabs1.contentEquals(ServiceUtil.TOP_TABS_SERVICE) %>">
  -								
  -								<aui:row>
  -									<aui:col width="25" cssClass="search-col">
  -										<datamgt:ddr
  -											cssClass="search-input select-box"
  -											depthLevel="1" 
  -											dictCollectionCode="SERVICE_ADMINISTRATION"
  -											itemNames="<%= ServiceDisplayTerms.SERVICE_ADMINISTRATION %>"
  -											itemsEmptyOption="true"
  -											selectedItems="<%= administrationCode %>"	
  -										>
  -										</datamgt:ddr>
  -		
  -									</aui:col>
  -									<aui:col width="25" cssClass="search-col">
  -										<datamgt:ddr
  -											cssClass="search-input select-box"
  -											depthLevel="1" 
  -											dictCollectionCode="SERVICE_DOMAIN"
  -											itemNames="<%= ServiceDisplayTerms.SERVICE_DOMAINCODE %>"
  -											itemsEmptyOption="true"	
  -											selectedItems="<%= domainCode %>"
  -										>
  -										</datamgt:ddr>
  -
  -									</aui:col>
  -									<aui:col width="45" cssClass="search-col">
  -										<liferay-ui:input-search 
  -											id="keywords1"
  -											name="keywords"
  -											title="keywords"
  -											placeholder='<%= LanguageUtil.get(locale, "name") %>' 
  -											cssClass="search-input input-keyword"
  -										/>
  -									</aui:col>
  -								</aui:row>
  -								
  +							<aui:row>
  +								<aui:col width="25" cssClass="search-col">
  +									<datamgt:ddr
  +										cssClass="search-input select-box"
  +										depthLevel="1" 
  +										dictCollectionCode="SERVICE_ADMINISTRATION"
  +										itemNames="<%= ServiceDisplayTerms.SERVICE_ADMINISTRATION %>"
  +										itemsEmptyOption="true"
  +										selectedItems="<%= administrationCode %>"	
  +									>
  +									</datamgt:ddr>
  +	
  +								</aui:col>
  +								<aui:col width="25" cssClass="search-col">
  +									<datamgt:ddr
  +										cssClass="search-input select-box"
  +										depthLevel="1" 
  +										dictCollectionCode="SERVICE_DOMAIN"
  +										itemNames="<%= ServiceDisplayTerms.SERVICE_DOMAINCODE %>"
  +										itemsEmptyOption="true"	
  +										selectedItems="<%= domainCode %>"
  +									>
  +									</datamgt:ddr>
  +
  +								</aui:col>
  +								<aui:col width="45" cssClass="search-col">
  +									<liferay-ui:input-search 
  +										id="keywords1"
  +										name="keywords"
  +										title="keywords"
  +										placeholder='<%= LanguageUtil.get(locale, "name") %>' 
  +										cssClass="search-input input-keyword"
  +									/>
  +								</aui:col>
  +							</aui:row>
   						</c:when>
   						
   						<c:when test="<%= tabs1.contentEquals(ServiceUtil.TOP_TABS_TEMPLATE) %>">
  
positive.code: 
  <%
  /**
   * OpenCPS is the open source Core Public Services software
  
negative.code: 			</c:when>
  			
  			<c:when test="<%= tabs1.contentEquals(ServiceUtil.TOP_TABS_DOMAIN) %>">
  				<portlet:renderURL var="editDomainURL" windowState="<%=LiferayWindowState.POP_UP.toString() %>">
  					<portlet:param name="mvcPath" value='<%= templatePath + "edit_domain.jsp" %>'/>
  					<portlet:param name="backURL" value="<%=currentURL %>"/>
  					<portlet:param name="tabs1" value="<%=tabs1 %>"/>
  				</portlet:renderURL>
  							
  				<c:if test="<%= ServiceTemplatePermission.contains(permissionChecker, scopeGroupId, ActionKeys.ADD_TEMPLATE) %>">
  					<%-- <aui:nav-item 
  						id="addDomain" 
  						label="add-domain" 
  						iconCssClass="icon-plus"  
  						href="<%= \"javascript:\" + renderResponse.getNamespace() + \"showPopup('\" + editDomainURL +\"');\" %>"
  					/> --%>
  					<aui:button 
  						icon="icon-plus" 
  						href="<%= \"javascript:\" + \"openDialog('\" + editDomainURL +\"');\" %>" 
  						cssClass="action-button" 
  						value="add-domain"
  					/>
  				</c:if>
  			</c:when>
  			
  			<c:when test="<%= tabs1.contentEquals(ServiceUtil.TOP_TABS_ADMINISTRATION) %>">
  				<portlet:renderURL var="editServiceAdministrationURL" windowState="<%=LiferayWindowState.POP_UP.toString() %>">
  					<portlet:param name="mvcPath" value='<%= templatePath + "edit_administrations.jsp" %>'/>
  					<portlet:param name="backURL" value="<%=currentURL %>"/>
  					<portlet:param name="tabs1" value="<%=tabs1 %>"/>
  				</portlet:renderURL>
  							
  				<c:if test="<%= ServiceTemplatePermission.contains(permissionChecker, scopeGroupId, ActionKeys.ADD_TEMPLATE) %>">
  					<%-- <aui:nav-item 
  						id="addDomain" 
  						label="add-administration" 
  						iconCssClass="icon-plus"  
  						href="<%= \"javascript:\" + renderResponse.getNamespace() + \"showPopup('\" + editDomainURL +\"');\" %>"
  					/> --%>
  					
  					<aui:button 
  						icon="icon-plus" 
  						href="<%=
  								\"javascript:\" +  \"openDialog('\" + 
  								editServiceAdministrationURL + \"','\" + 
  								renderResponse.getNamespace() + \"updateServiceAdministration\" + \"','\" +
  								UnicodeLanguageUtil.get(pageContext, \"update-service-administration\") +
  								\"');\" 
  							%>"
  						cssClass="action-button" 
  						value="add-administration"
  					/>
  				</c:if>
  			</c:when>
  			
  		</c:choose>
  