diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
index 4e8afb46..3cb3815b 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
@@ -115,10 +115,16 @@ public class QueryFieldLabels {
 	public static final String CO_PI_LABEL = "coPILabelLit";
 	public static final String GRANT_URL = "grantLit";
 	public static final String GRANT_LABEL = "grantLabelLit";
-	public static final String GRANT_START_DATE = "grantStartDateLit";
-	public static final String GRANT_END_DATE = "grantEndDateLit";
-	public static final String GRANT_START_DATE_FOR_GRANT = "grantStartDateForGrantLit";
-	public static final String GRANT_END_DATE_FOR_GRANT = "grantEndDateForGrantLit";
+	
+	/*
+	 * Role Start/End Date is chosen as the default Start Date for all the queries,
+	 * in whose absence Grant Start/End Date is chosen.
+	 */
+	
+	public static final String ROLE_START_DATE = "grantStartDateLit";
+	public static final String ROLE_END_DATE = "grantEndDateLit";
+	public static final String GRANT_START_DATE = "grantStartDateForGrantLit";
+	public static final String GRANT_END_DATE = "grantEndDateForGrantLit";
 	
 	
 }
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 61f18534..8fb49116 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
@@ -646,21 +646,21 @@ public class CoPIGrantCountQueryRunner implements QueryRunner<CoPIData> {
 		}
 
 
-		RDFNode grantStartYear = solution.get(QueryFieldLabels.GRANT_START_DATE);
+		RDFNode grantStartYear = solution.get(QueryFieldLabels.ROLE_START_DATE);
 		if (grantStartYear != null) {
 			grant.setGrantStartDate(grantStartYear.toString());
 		}else{
-			grantStartYear = solution.get(QueryFieldLabels.GRANT_START_DATE_FOR_GRANT);
+			grantStartYear = solution.get(QueryFieldLabels.GRANT_START_DATE);
 			if(grantStartYear != null){
 				grant.setGrantStartDate(grantStartYear.toString());
 			}			
 		}
 		
-		RDFNode grantEndDate = solution.get(QueryFieldLabels.GRANT_END_DATE);
+		RDFNode grantEndDate = solution.get(QueryFieldLabels.ROLE_END_DATE);
 		if (grantEndDate != null) {
 			grant.setGrantEndDate(grantEndDate.toString());
 		}else{
-			grantEndDate = solution.get(QueryFieldLabels.GRANT_END_DATE_FOR_GRANT);
+			grantEndDate = solution.get(QueryFieldLabels.GRANT_END_DATE);
 			if(grantEndDate != null){
 				grant.setGrantEndDate(grantEndDate.toString());
 			}			
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java
index f6edb5bb..5ed4f380 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java
@@ -138,21 +138,21 @@ public class EntityGrantCountQueryRunner implements QueryRunner<Entity>  {
 					grant.setGrantLabel(grantLabelNode.toString());
 				}
 
-				RDFNode grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE);
+				RDFNode grantStartDateNode = solution.get(QueryFieldLabels.ROLE_START_DATE);
 				if(grantStartDateNode != null){
 					grant.setGrantStartDate(grantStartDateNode.toString());
 				}else {
-					grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE_FOR_GRANT);
+					grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE);
 					if(grantStartDateNode != null){
 						grant.setGrantStartDate(grantStartDateNode.toString());
 					}
 				}
 				
-				RDFNode grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE);
+				RDFNode grantEndDateNode = solution.get(QueryFieldLabels.ROLE_END_DATE);
 				if(grantEndDateNode != null){
 					grant.setGrantEndDate(grantEndDateNode.toString());
 				}else {
-					grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE_FOR_GRANT);
+					grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE);
 					if(grantEndDateNode != null){
 						grant.setGrantEndDate(grantEndDateNode.toString());
 					}				
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java
index 6de3e089..2b625f13 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java
@@ -103,21 +103,21 @@ public class PersonGrantCountQueryRunner implements QueryRunner<Set<Grant>>{
 				grant.setIndividualLabel(grantLabelNode.toString());
 			}
 			
-			RDFNode grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE);
+			RDFNode grantStartDateNode = solution.get(QueryFieldLabels.ROLE_START_DATE);
 			if(grantStartDateNode != null){
 				grant.setGrantStartDate(grantStartDateNode.toString());
 			}else {
-				grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE_FOR_GRANT);
+				grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE);
 				if(grantStartDateNode != null){
 					grant.setGrantStartDate(grantStartDateNode.toString());
 				}
 			}
 			
-			RDFNode grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE);
+			RDFNode grantEndDateNode = solution.get(QueryFieldLabels.ROLE_END_DATE);
 			if(grantEndDateNode != null){
 				grant.setGrantEndDate(grantEndDateNode.toString());
 			}else {
-				grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE_FOR_GRANT);
+				grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE);
 				if(grantEndDateNode != null){
 					grant.setGrantEndDate(grantEndDateNode.toString());
 				}