diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
index 96c125f04c..d07920f7ab 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
@@ -316,7 +316,7 @@ protected static void addClassCountsToGroup(VClassGroup group, SearchEngine sear
 
         SearchQuery query = searchEngine.createQuery().
             setRows(0).
-            setQuery(VitroSearchTermNames.CLASSGROUP_URI + ":" + groupUri ).
+            setQuery(VitroSearchTermNames.CLASSGROUP_URI + ":\"" + groupUri + "\"").
             addFacetFields( facetOnField ). //facet on type to get counts for classes in classgroup
             setFacetMinCount(0);
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java
index d752bfe28a..cb39c96a73 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java
@@ -54,7 +54,7 @@ protected Map<String,Individual> getIndividualsForClass(String vclassURI, Webapp
 			if( VitroVocabulary.OWL_THING.equals( vclassURI )){
 				query.setQuery( "*:*" );
 			}else{
-				query.setQuery( VitroSearchTermNames.MOST_SPECIFIC_TYPE_URIS + ":" + vclassURI);
+				query.setQuery( VitroSearchTermNames.MOST_SPECIFIC_TYPE_URIS + ":\"" + vclassURI + "\"");
 			}
 			 query.setStart(0)
              .setRows(1000);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
index adb7e8bb88..36523b1eba 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
@@ -195,7 +195,7 @@ private boolean tooManyRangeOptions(VitroRequest vreq, HttpSession session ) thr
     		if( VitroVocabulary.OWL_THING.equals( type )){
     			query.setQuery( "*:*" );
     		}else{
-    			query.setQuery( VitroSearchTermNames.RDFTYPE + ":" + type);
+    			query.setQuery( VitroSearchTermNames.RDFTYPE + ":\"" + type + "\"");
     		}
     		query.setRows(0);
     		SearchResponse rsp = searchEngine.query(query);
@@ -568,7 +568,7 @@ private Object rangeIndividualsExist(List<VClass> types) throws SearchEngineExce
     	for( VClass type:types){
     		//search  for type count.
     		SearchQuery query = searchEngine.createQuery();
-    		query.setQuery( VitroSearchTermNames.RDFTYPE + ":" + type.getURI());
+    		query.setQuery( VitroSearchTermNames.RDFTYPE + ":\"" + type.getURI() + "\"");
     		query.setRows(0);
 
     		SearchResponse rsp = searchEngine.query(query);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java
index ea88a0d28c..daa2937311 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java
@@ -245,7 +245,7 @@ private boolean mightBeProfileRequest(String requestPath) {
 	 */
 	private String findEtagForIndividual(String individualUri) {
 		SearchEngine search = ApplicationUtils.instance().getSearchEngine();
-		SearchQuery query = search.createQuery("URI:" + individualUri).addFields(
+		SearchQuery query = search.createQuery("URI:\"" + individualUri + "\"").addFields(
 				ETAG_FIELD);
 
 		try {