diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
index cbc8dca3..18f5f782 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
@@ -53,7 +53,7 @@
                     <div id="error-notification" class="ui-state-error" style="padding:10px; -moz-box-shadow:0 0 6px #980000; -webkit-box-shadow:0 0 6px #980000; box-shadow:0 0 6px #980000;">
                         <a class="ui-notify-close" href="#" title="${i18n().error_notification}"><span class="ui-icon ui-icon-close" style="float:right"></span></a>
                         <span style="float:left; margin:0 5px 0 0;" class="ui-icon ui-icon-alert"></span>
-                        <h1>&#035;{title}</h1>
+                        <h1>&#035;{title!}</h1>
                         <p>&#035;{text}</p>
                         <p style="text-align:center"><a class="ui-notify-close" href="#">${i18n().close_me}</a></p>
                     </div>
@@ -61,7 +61,7 @@
                     <div id="warning-notification" class="ui-state-highlight ui-corner-all" >
                     <a class="ui-notify-close ui-notify-cross" href="#" title="${i18n().error_notification}">x</a>
                     <span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
-                        <h1>&#035;{title}</h1>
+                        <h1>&#035;{title!}</h1>
                         <p>&#035;{text}</p>
                     </div>
                 
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
index f0ac7b22..95bfdef9 100644
--- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
+++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
@@ -27,7 +27,7 @@ corresponding changes in the included Templates. -->
         <div id="error-notification" class="ui-state-error" style="padding:10px; -moz-box-shadow:0 0 6px #980000; -webkit-box-shadow:0 0 6px #980000; box-shadow:0 0 6px #980000;">
             <a class="ui-notify-close" href="#" title="${i18n().error_notification}"><span class="ui-icon ui-icon-close" style="float:right"></span></a>
             <span style="float:left; margin:0 5px 0 0;" class="ui-icon ui-icon-alert"></span>
-            <h1>&#035;{title}</h1>
+            <h1>&#035;{title!}</h1>
             <p>&#035;{text}</p>
             <p style="text-align:center"><a class="ui-notify-close" href="#">${i18n().close_me}</a></p>
         </div>
@@ -35,7 +35,7 @@ corresponding changes in the included Templates. -->
         <div id="warning-notification" class="ui-state-highlight ui-corner-all" >
 	        <a class="ui-notify-close ui-notify-cross" href="#" title="${i18n().error_notification}">x</a>
 	        <span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
-	        <h1>&#035;{title}</h1>
+	        <h1>&#035;{title!}</h1>
 	        <p>&#035;{text}</p>
         </div>
     </div>
diff --git a/themes/wilma/templates/gadgetDetails.ftl b/themes/wilma/templates/gadgetDetails.ftl
index a3fa8ea4..50ba92a9 100644
--- a/themes/wilma/templates/gadgetDetails.ftl
+++ b/themes/wilma/templates/gadgetDetails.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for the body of the GadgetDetails page -->
 
-<div class="pageTitle" id="gadgets-title"><h2>${title}</h2></div>
+<div class="pageTitle" id="gadgets-title"><h2>${title!}</h2></div>
 
 <#-- VIVO OpenSocial Extension by UCSF -->
 <#if openSocial??>
diff --git a/themes/wilma/templates/gadgetLogin.ftl b/themes/wilma/templates/gadgetLogin.ftl
index f66bce4b..69c75cca 100644
--- a/themes/wilma/templates/gadgetLogin.ftl
+++ b/themes/wilma/templates/gadgetLogin.ftl
@@ -11,7 +11,7 @@ th {
 }
 </style>	
 
-<div class="pageTitle" id="gadgets-title"><h2>${title}</h2></div>
+<div class="pageTitle" id="gadgets-title"><h2>${title!}</h2></div>
 
 <#-- VIVO OpenSocial Extension by UCSF -->
 <#if openSocial??>
diff --git a/themes/wilma/templates/head.ftl b/themes/wilma/templates/head.ftl
index eef17c30..15381e75 100644
--- a/themes/wilma/templates/head.ftl
+++ b/themes/wilma/templates/head.ftl
@@ -4,7 +4,7 @@
 <!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer-->
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-<title>${title}</title>
+<title>${siteName!}</title>
 
 <#-- VIVO OpenSocial Extension by UCSF -->
 <#if openSocial??>