anchor.diff:  				}
   				%>
   				</aui:select>
  -			</aui:column>	
  -			<aui:button-row>
  -				<aui:button name="searchUsers" value="select" type="submit" />
  -			</aui:button-row>
  +			</aui:column>
  +		</aui:fieldset>
  +		<aui:fieldset>
  +			<aui:column>
  +				<aui:input label="first-name" name="firstName" size="20" value="<%=firstName %>" />
  +				<aui:input label="screen-name" name="screenName" size="20" value="<%=screenName %>" />
  +				<aui:button-row>
  +					<aui:button name="searchUsers" value="search" type="submit" />
  +				</aui:button-row>
  +			</aui:column>
  +			<aui:column>
  +				<aui:input label="last-name" name="lastName" size="20" value="<%=lastName %>" />
  +				<aui:input label="usermanagement.email-address" name="emailAddress" size="20" value="<%=emailAddress %>" />
  +			</aui:column>
   		</aui:fieldset>
   	</aui:form>
   	<%if(theTeam!=null)
  
positive.code: 		           
  
  
  		       	userParams.put("notInCourseRoleEdit", new CustomSQLParam("WHERE User_.userId NOT IN "
  		              + " (SELECT UserGroupRole.userId " + "  FROM UserGroupRole "
  		              + "  WHERE  (UserGroupRole.groupId = ?) AND (UserGroupRole.roleId = ?))", new Long[] {
  		              course.getGroupCreatedId(),
  		              RoleLocalServiceUtil.getRole(prefs.getEditorRole()).getRoleId() }));
  		           
  			
  			
  			if(theTeam==null){
  				if(criteria.trim().length()==0){
  					userParams.put("usersGroups", new Long(themeDisplay.getScopeGroupId()));
  					
  					userListPage  = UserLocalServiceUtil.search(themeDisplay.getCompanyId(), criteria, 0, userParams, searchContainer.getStart(), searchContainer.getEnd(), obc);
  				}else{
  					userParams.put("usersGroups", new Long(themeDisplay.getScopeGroupId()));
  					userListPage  = UserLocalServiceUtil.search(themeDisplay.getCompanyId(), criteria, 0, userParams, searchContainer.getStart(), searchContainer.getEnd(), obc);
  				}
  			}else{
  				userParams.put("usersGroups", theTeam.getGroupId());
  				userParams.put("usersTeams", theTeam.getTeamId());
  				userListPage  = UserLocalServiceUtil.search(themeDisplay.getCompanyId(), criteria, 0, userParams, searchContainer.getStart(), searchContainer.getEnd(), obc);
  			}
  			
  			
  
  				int userCount = UserLocalServiceUtil.searchCount(themeDisplay.getCompanyId(), criteria, 0, userParams);
  				
  				pageContext.setAttribute("results", userListPage);
  			    	pageContext.setAttribute("total", userCount);
  			
  			
  			    	
  			%>
  		</liferay-ui:search-container-results>
  		
  
negative.code: 			<%
  			List<User> userListPage  = null;
  			String middleName = null;
  			OrderByComparator obc = new   UserLastNameComparator(true);			
  			LinkedHashMap userParams = new LinkedHashMap();
  			int userCount = 0;
  
  			userParams.put("notInCourseRoleTeach", new CustomSQLParam("WHERE User_.userId NOT IN "
  		              + " (SELECT UserGroupRole.userId " + "  FROM UserGroupRole "
  