Index: api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
===================================================================
--- api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java	(revision 17726)
+++ api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java	(working copy)
@@ -1514,7 +1514,6 @@
 	 * @see ConceptDAO#getConcepts(String, List, boolean, List, List, List, List, Concept, Integer,
 	 *      Integer)
 	 */
-	@SuppressWarnings( { "rawtypes" })
 	@Override
 	public List<ConceptSearchResult> getConcepts(String phrase, List<Locale> locales, boolean includeRetired,
 	        List<ConceptClass> requireClasses, List<ConceptClass> excludeClasses, List<ConceptDatatype> requireDatatypes,
@@ -1532,7 +1531,8 @@
 			pl.add(Projections.property("cw1.word"));
 			//if we have multiple words for the same concept, get the one with a highest weight
 			pl.add(Projections.max("cw1.weight"));
-			pl.add(Projections.property("cw1.conceptName"));
+			pl.add(Projections.min("cw1.conceptName"));
+			pl.add(Projections.property("cw1.weight"));
 			
 			searchCriteria.setProjection(pl);
 			searchCriteria.addOrder(Order.desc("cw1.weight"));
Index: api/src/test/java/org/openmrs/api/ConceptServiceTest.java
===================================================================
--- api/src/test/java/org/openmrs/api/ConceptServiceTest.java	(revision 17726)
+++ api/src/test/java/org/openmrs/api/ConceptServiceTest.java	(working copy)
@@ -33,7 +33,6 @@
 
 import org.apache.commons.collections.CollectionUtils;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openmrs.Concept;
 import org.openmrs.ConceptAnswer;
@@ -1364,7 +1363,6 @@
 	 * 
 	 */
 	@Test
-	@Ignore
 	@Verifies(value = "should return the best matched name as the first item in the searchResultsList", method = "getConcepts(String,List<Locale>,null,List<ConceptClass>,List<ConceptClass>,List<ConceptDatatype>,List<ConceptDatatype>,Concept,Integer,Integer)")
 	public void getConcepts_shouldReturnTheBestMatchedNameAsTheFirstItemInTheSearchResultsList() throws Exception {
 		executeDataSet("org/openmrs/api/include/ConceptServiceTest-words.xml");
@@ -1654,7 +1652,6 @@
 	 *      >,List<ConceptDatatype>,List<ConceptDatatype>,Concept,Integer,Integer)}
 	 */
 	@Test
-	@Ignore
 	@Verifies(value = "should return concept search results that match unique concepts", method = "getConcepts(String,List<Locale>,null,List<ConceptClass>,List<ConceptClass>,List<ConceptDatatype>,List<ConceptDatatype>,Concept,Integer,Integer)")
 	public void getConcepts_shouldReturnConceptSearchResultsThatMatchUniqueConcepts() throws Exception {
 		executeDataSet("org/openmrs/api/include/ConceptServiceTest-words.xml");