diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
index a003123fd..8d904a3f7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
@@ -152,7 +152,7 @@ public class Entity2LuceneDoc  implements Obj2DocIface{
                 if( clz.getSearchBoost() != null )
                     doc.setBoost( doc.getBoost() + clz.getSearchBoost() );
                 
-                Field typeField = new Field (term.RDFTYPE, clz.getName(), Field.Store.YES, Field.Index.ANALYZED);
+                Field typeField = new Field (term.RDFTYPE, clz.getURI(), Field.Store.YES, Field.Index.NOT_ANALYZED);
                 //typeField.setBoost(2*FIELD_BOOST);
                 
                 doc.add( typeField);
@@ -163,7 +163,7 @@ public class Entity2LuceneDoc  implements Obj2DocIface{
                 //Classgroup URI
                 if( clz.getGroupURI() != null ){
                 	Field classGroupField = new Field(term.CLASSGROUP_URI, clz.getGroupURI(), 
-                            Field.Store.YES, Field.Index.ANALYZED);
+                            Field.Store.YES, Field.Index.NOT_ANALYZED);
                 //	classGroupField.setBoost(FIELD_BOOST);
                     doc.add(classGroupField);
                 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java
index 196ae7a76..25f03ff55 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java
@@ -21,7 +21,6 @@ import javax.servlet.ServletContextEvent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.KeywordAnalyzer;
 import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.search.BooleanQuery;