diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java
index 97739e0ca..441485401 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java
@@ -395,16 +395,17 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet {
     }
 
     protected String mergeBodyToTemplate(String templateName, Map<String, Object> map, Configuration config) {
-        templateName = "body/" + templateName;
+        templateName = "body/" + templateName;     // Remove once we flatten template directory
     	String body = mergeToTemplate(templateName, map, config).toString();
     	return body;
     }
     
     protected void writePage(Map<String, Object> root, Configuration config, HttpServletResponse response) {
-        String templateName = "page/" + getPageTemplateName();
+        String templateName = "page/" + getPageTemplateName();     // Remove the directory once we flatten template directory
         writeTemplate(templateName, root, config, response);                   
     }
     
+    // Remove this method once we flatten template directory   
     protected void ajaxWrite(String templateName, Map<String, Object> map, Configuration config, HttpServletResponse response) {
         templateName = "ajax/" + templateName;
         writeTemplate(templateName, map, config, response);                   
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
index 69133ffba..67004aaf4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
@@ -359,6 +359,8 @@ public class AutocompleteController extends FreeMarkerHttpServlet implements Sea
     }
  
     private void doSearchError(String templateName, Map<String, Object> map, Configuration config, HttpServletResponse response) {
+        // For now, we are not sending an error message back to the client because with the default autocomplete configuration it
+        // chokes.
         ajaxWrite(templateName, map, config, response);
     }
 
diff --git a/webapp/web/templates/freemarker/ajax/autocompleteResults.ftl b/webapp/web/templates/freemarker/ajax/autocompleteResults.ftl
index b4957572d..7a9892625 100644
--- a/webapp/web/templates/freemarker/ajax/autocompleteResults.ftl
+++ b/webapp/web/templates/freemarker/ajax/autocompleteResults.ftl
@@ -7,10 +7,14 @@
 <@json.array results />
 -->
 
+<#if errorMsg??>${errorMsg}
+
+<#else>
 [ 
 <#if results??>
     <#list results as result>
         { "label": "${result.label}", "uri": "${result.uri}" }<#if result_has_next>,</#if>       
     </#list>
 </#if>
-]
\ No newline at end of file
+]
+</#if>
\ No newline at end of file