diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java
index d1b61c9b7..6bb6abbbd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java
@@ -354,14 +354,24 @@ public class VisualizationCodeGenerator {
 			int totalUniqueCoAuthors, int renderedFullSparks,
 			String sparklineDisplayOptions) {
 		
-		String csvDownloadURL = ""; 
+		String csvDownloadURLHref = ""; 
 		
 		try {
-			csvDownloadURL = getCSVDownloadURL();
+			if (getCSVDownloadURL() != null) {
+				
+				csvDownloadURLHref = "<a href=\"" + getCSVDownloadURL() + "\" class=\"inline_href\">(.CSV File)</a>";
+				
+			} else {
+				
+				csvDownloadURLHref = "";
+				
+			}
+
 		} catch (UnsupportedEncodingException e) {
-			csvDownloadURL = "#";
+			csvDownloadURLHref = "";
 		}
 		
+		
 		visualizationCode.append("var fullSparklineView = new google.visualization.DataView(data);\n" +
 								 "fullSparklineView.setColumns([1]);\n");
 		
@@ -378,7 +388,7 @@ public class VisualizationCodeGenerator {
 												 "+ ' <span class=\"sparkline_range\">" +
 												"(" + minPubYearConsidered + " - " + currentYear + ")" +
 												"</span> '" +
-												"+ ' <a href=\"" + csvDownloadURL + "\" class=\"inline_href\">(.CSV File)</a>';" +
+												"+ ' " + csvDownloadURLHref + " ';" +
 								"$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_text').html(allSparksText);");
 		
 		visualizationCode.append("}\n ");
@@ -467,32 +477,38 @@ public class VisualizationCodeGenerator {
 		
 		StringBuilder divContextCode = new StringBuilder();
 		
-		try {
+		String csvDownloadURLHref = ""; 
+		
+		if (yearToUniqueCoauthorsCount.size() > 0) {
 			
-			String downloadFileCode;
-			if (yearToUniqueCoauthorsCount.size() > 0) {
-				
-				
-				String downloadURL = getCSVDownloadURL();
-				
-				downloadFileCode = "Download data as <a href='" + downloadURL + "'>.csv</a> file.<br />";
-				
-				valueObjectContainer.setDownloadDataLink(downloadURL);
-			} else {
-				downloadFileCode = "No data available to export.<br />";
+			try {
+				if (getCSVDownloadURL() != null) {
+					
+					csvDownloadURLHref = "Download data as <a href='" + getCSVDownloadURL() + "'>.csv</a> file.<br />";
+					valueObjectContainer.setDownloadDataLink(getCSVDownloadURL());
+					
+				} else {
+					
+					csvDownloadURLHref = "";
+					
+				}
+
+			} catch (UnsupportedEncodingException e) {
+				csvDownloadURLHref = "";
 			}
 			
-			String tableCode = generateDataTable();
 			
-			divContextCode.append("<p>" + tableCode +
-								  downloadFileCode + "</p>");
-			
-			valueObjectContainer.setTable(tableCode);
-
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
+		} else {
+			csvDownloadURLHref = "No data available to export.<br />";
 		}
 		
+		String tableCode = generateDataTable();
+		
+		divContextCode.append("<p>" + tableCode +
+					csvDownloadURLHref + "</p>");
+		
+		valueObjectContainer.setTable(tableCode);
+		
 		return divContextCode.toString();
 		
 	}
@@ -523,7 +539,7 @@ public class VisualizationCodeGenerator {
 		
 			return downloadURL;
 		} else {
-			return "#";
+			return null;
 		}
 		
 	}
@@ -537,20 +553,6 @@ public class VisualizationCodeGenerator {
 		
 		String fullTimelineLink;
 		if (yearToUniqueCoauthorsCount.size() > 0) {
-//			String fullTimelineNetworkURL = uri.toString() + "?" + 
-//										VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE + 
-//										 "=" + URLEncoder.encode(individualURI, 
-//												 				 VisualizationController.URL_ENCODING_SCHEME).toString() +
-//										 "&" +
-//										 "vis" +
-//										 "=" + URLEncoder.encode(VisualizationController
-//												 						.PERSON_PUBLICATION_COUNT_VIS_URL_VALUE, 
-//												 				 VisualizationController.URL_ENCODING_SCHEME).toString() +
-//										 "&" +
-//										 VisualizationFrameworkConstants.RENDER_MODE_URL_HANDLE + 
-//										 "=" + URLEncoder.encode(VisualizationFrameworkConstants.STANDALONE_RENDER_MODE_URL_VALUE, 
-//								 				 				 VisualizationController.URL_ENCODING_SCHEME).toString();
-			
 			
 			String fullTimelineNetworkURL = contextPath
 							+ "/admin/visQuery"
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java
index 9d4d8666b..51f0e1464 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java
@@ -361,14 +361,24 @@ public class VisualizationCodeGenerator {
 			int totalPublications, int renderedFullSparks,
 			String sparklineDisplayOptions) {
 		
-		String csvDownloadURL = ""; 
+		String csvDownloadURLHref = ""; 
 		
 		try {
-			csvDownloadURL = getCSVDownloadURL();
+			if (getCSVDownloadURL() != null) {
+				
+				csvDownloadURLHref = "<a href=\"" + getCSVDownloadURL() + "\" class=\"inline_href\">(.CSV File)</a>";
+				
+			} else {
+				
+				csvDownloadURLHref = "";
+				
+			}
+
 		} catch (UnsupportedEncodingException e) {
-			csvDownloadURL = "#";
+			csvDownloadURLHref = "";
 		}
 		
+		
 		visualizationCode.append("var fullSparklineView = new google.visualization.DataView(data);\n" +
 								 "fullSparklineView.setColumns([1]);\n");
 		
@@ -387,7 +397,7 @@ public class VisualizationCodeGenerator {
 												"<span class=\"sparkline_range\">" +
 												"(" + minPubYearConsidered + " - " + currentYear + ")" +
 												"</span> '" +
-												"+ ' <a href=\"" + csvDownloadURL + "\" class=\"inline_href\">(.CSV File)</a>';" +
+												"+ ' " + csvDownloadURLHref + " ';" +
 								"$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_text').html(allSparksText);");
 		
 		visualizationCode.append("}\n ");
@@ -476,32 +486,38 @@ public class VisualizationCodeGenerator {
 		
 		StringBuilder divContextCode = new StringBuilder();
 		
-		try {
+		String csvDownloadURLHref = ""; 
+		
+		if (yearToPublicationCount.size() > 0) {
 			
-			String downloadFileCode;
-			if (yearToPublicationCount.size() > 0) {
-				
-				
-				String downloadURL = getCSVDownloadURL();
-				
-				downloadFileCode = "Download data as <a href='" + downloadURL + "'>.csv</a> file.<br />";
-				
-				valueObjectContainer.setDownloadDataLink(downloadURL);
-			} else {
-				downloadFileCode = "No data available to export.<br />";
+			try {
+				if (getCSVDownloadURL() != null) {
+					
+					csvDownloadURLHref = "Download data as <a href='" + getCSVDownloadURL() + "'>.csv</a> file.<br />";
+					valueObjectContainer.setDownloadDataLink(getCSVDownloadURL());
+					
+				} else {
+					
+					csvDownloadURLHref = "";
+					
+				}
+
+			} catch (UnsupportedEncodingException e) {
+				csvDownloadURLHref = "";
 			}
 			
-			String tableCode = generateDataTable();
 			
-			divContextCode.append("<p>" + tableCode +
-								  downloadFileCode + "</p>");
-			
-			valueObjectContainer.setTable(tableCode);
-
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
+		} else {
+			csvDownloadURLHref = "No data available to export.<br />";
 		}
 		
+		String tableCode = generateDataTable();
+		
+		divContextCode.append("<p>" + tableCode +
+					csvDownloadURLHref + "</p>");
+		
+		valueObjectContainer.setTable(tableCode);
+		
 		return divContextCode.toString();
 		
 	}
@@ -527,7 +543,7 @@ public class VisualizationCodeGenerator {
 		System.out.println(" ----- >>>> " + contextPath + " XX " + individualURIParam + " XX " + downloadURL);
 			return downloadURL;
 		} else {
-			return "#";
+			return null;
 		}
 		
 	}
@@ -566,10 +582,6 @@ public class VisualizationCodeGenerator {
 		 				    + VisualizationFrameworkConstants.VIS_TYPE_URL_HANDLE 
 							+ "=" + URLEncoder.encode("person_level", 
 					 				 VisualizationController.URL_ENCODING_SCHEME).toString()
-					 	    + "&"
-		 				    + VisualizationFrameworkConstants.VIS_CONTAINER_URL_HANDLE 
-							+ "=" + URLEncoder.encode("ego_sparkline", 
-					 				 VisualizationController.URL_ENCODING_SCHEME).toString()						 				 
 		 				    + "&"
 		 				    + VisualizationFrameworkConstants.RENDER_MODE_URL_HANDLE
 							+ "=" + URLEncoder.encode(VisualizationFrameworkConstants.STANDALONE_RENDER_MODE_URL_VALUE, 
@@ -600,18 +612,27 @@ public class VisualizationCodeGenerator {
 	
 	private String generateDataTable() {
 		
-		String csvDownloadURL = ""; 
+		String csvDownloadURLHref = ""; 
 		
 		try {
-			csvDownloadURL = getCSVDownloadURL();
+			if (getCSVDownloadURL() != null) {
+				
+				csvDownloadURLHref = "<a href=\"" + getCSVDownloadURL() + "\">(.CSV File)</a>";
+				
+			} else {
+				
+				csvDownloadURLHref = "";
+				
+			}
+
 		} catch (UnsupportedEncodingException e) {
-			csvDownloadURL = "#";
+			csvDownloadURLHref = "";
 		}
 		
 		StringBuilder dataTable = new StringBuilder();
 		
 		dataTable.append("<table id='sparkline_data_table'>" +
-								"<caption>Publications per year <a href=\"" + csvDownloadURL + "\">(.CSV File)</a></caption>" +
+								"<caption>Publications per year " + csvDownloadURLHref + "</caption>" +
 								"<thead>" +
 										"<tr>" +
 											"<th>Year</th>" +
diff --git a/webapp/web/templates/visualization/person_level.jsp b/webapp/web/templates/visualization/person_level.jsp
index ede5e0ae4..13ff543ec 100644
--- a/webapp/web/templates/visualization/person_level.jsp
+++ b/webapp/web/templates/visualization/person_level.jsp
@@ -167,7 +167,7 @@
 		        	<c:set var='authorsText' value='multi-author' />
 		        </c:if>
 		        
-		        <span id="no_coauthorships">Currently there are no ${authorsText} papers for <span id="no_coauthorships_person">this author</span> in the VIVO database.</span>
+		        <span id="no_coauthorships">Currently there are no ${authorsText} papers for <span id="no_coauthorships_person" class="author_name">this author</span> in the VIVO database.</span>
 		    </c:otherwise>
 		</c:choose>
 		
@@ -251,7 +251,11 @@ $(document).ready(function(){
 							  jQuery.parseJSON(getWellFormedURLs("${requestScope.egoURIParam}", "profile_info")));
 
 	<c:if test='${numOfCoAuthorShips <= 0}'>
-		setProfileName('no_coauthorships_person', $('#ego_label').text());
+
+		if ($('#ego_label').text().length > 0) {
+			setProfileName('no_coauthorships_person', $('#ego_label').text());
+		}
+		
 	</c:if>