diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
index 5b584cd9..0a659498 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
@@ -150,11 +150,9 @@ public class CoPIGrantCountQueryRunner implements QueryRunner<CoPIData> {
 
 			+			"?CoPI rdfs:label ?CoPILabel .	"
 
-			+			"OPTIONAL {	?Grant core:startDate ?GrantStartDate }	. "
-							
-			+			"OPTIONAL {	?Grant core:endDate ?GrantEndDate  } . "
-						
-			+		"} "
+			+ 			SPARQL_QUERY_COMMON_OPTIONAL_BLOCK
+			
+			+ 		"} "
 				
 			+		"UNION "