diff --git a/wagtail/project_template/project_name/templates/base.html b/wagtail/project_template/project_name/templates/base.html
index 5ddfd5f9a..76c7680ac 100644
--- a/wagtail/project_template/project_name/templates/base.html
+++ b/wagtail/project_template/project_name/templates/base.html
@@ -1,4 +1,4 @@
-{% templatetag openblock %} load compress static wagtailuserbar {% templatetag closeblock %}
+{% templatetag openblock %} load static wagtailuserbar {% templatetag closeblock %}
 
 <!DOCTYPE html>
 <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
@@ -12,11 +12,11 @@
         <meta name="description" content="" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-        {# Global stylesheets #}
+        {% templatetag opencomment %} Global stylesheets {% templatetag closecomment %}
         <link rel="stylesheet" type="text/css" href="{% templatetag openblock %} static 'css/{{ project_name }}.css' {% templatetag closeblock %}">
 
         {% templatetag openblock %} block extra_css {% templatetag closeblock %}
-            {# Override this in templates to add extra stylesheets #}
+            {% templatetag opencomment %} Override this in templates to add extra stylesheets {% templatetag closecomment %}
         {% templatetag openblock %} endblock {% templatetag closeblock %}
     </head>
 
@@ -25,11 +25,11 @@
 
         {% templatetag openblock %} block content {% templatetag closeblock %}{% templatetag openblock %} endblock {% templatetag closeblock %}
 
-        {# Global javascript #}
+        {% templatetag opencomment %} Global javascript {% templatetag closecomment %}
         <script type="text/javascript" src="{% templatetag openblock %} static 'js/{{ project_name }}.js' {% templatetag closeblock %}"></script>
 
         {% templatetag openblock %} block extra_js {% templatetag closeblock %}
-            {# Override this in templates to add extra javascript #}
+            {% templatetag opencomment %} Override this in templates to add extra javascript {% templatetag closecomment %}
         {% templatetag openblock %} endblock {% templatetag closeblock %}
     </body>
 </html>
diff --git a/wagtail/project_template/search/templates/search/search.html b/wagtail/project_template/search/templates/search/search.html
index 778d93621..848c3e372 100644
--- a/wagtail/project_template/search/templates/search/search.html
+++ b/wagtail/project_template/search/templates/search/search.html
@@ -9,7 +9,7 @@
     <h1>Search</h1>
 
     <form action="{% templatetag openblock %} url 'search' {% templatetag closeblock %}" method="get">
-        <input type="text" name="query"{% templatetag openblock %} if search_query {% templatetag closeblock %} value="{% templatetag openvariable %} search_query {% templatetag closevariable %}{% templatetag openblock %} endif {% templatetag closeblock %}">
+        <input type="text" name="query"{% templatetag openblock %} if search_query {% templatetag closeblock %} value="{% templatetag openvariable %} search_query {% templatetag closevariable %}"{% templatetag openblock %} endif {% templatetag closeblock %}>
         <input type="submit" value="Search">
     </form>
 
