diff --git a/app/views/plans/_plan_details.html.erb b/app/views/plans/_plan_details.html.erb
index 9da1c40..9ed400a 100644
--- a/app/views/plans/_plan_details.html.erb
+++ b/app/views/plans/_plan_details.html.erb
@@ -200,9 +200,9 @@
 
 	<p>
 		<% if based_on.org != plan.template.org %>
-			<%= _('A version of ') %> "<%= based_on.title %>" <%= _(' that has been customised by ') %> <%= plan.template.org.name %>
+			<%= _('A version of ') %> "<%= based_on.title %>" <%= based_on.title.downcase.end_with?('template') ? '' : _('template') %><%= _(' that has been customised by ') %> <%= plan.template.org.name %>
 		<% else %>
-			<%= _('The')%> "<%= plan.template.title %>" <%= _('generic template') if plan.template.is_default %> <%= _('provided by ') %><%= plan.template.org.name %>
+			<%= _('The')%> "<%= plan.template.title %>" <%= (plan.template.is_default ? _('generic template') : plan.template.title.downcase.end_with?('template') ? '' : _('template')) %> <%= _(' provided by ') %><%= plan.template.org.name %>
 		<% end %>
 	</p>
 
diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb
index 96dda5c..0a70aba 100644
--- a/app/views/shared/_accessible_combobox.html.erb
+++ b/app/views/shared/_accessible_combobox.html.erb
@@ -7,6 +7,7 @@
          data-combobox-prefix-class="combobox"
          data-combobox-case-sensitive="no"
          data-combobox-search-option="containing"
+         data-combobox-allow-suggestion-on-empty="true"
          value="<%= default_selection[attribute] unless default_selection.nil? %>" />
   <datalist id="<%= id %>_list">
     <% models.each do |model| %>
@@ -50,7 +51,7 @@
       }).change(function(){
         $(clear).css("display", $(combo).val().trim().length <= 0 ? 'none' : 'inline');
       });
-  
+
       // Hide the clear button if it gets clicked
       // -------------------------------------------------------------
       $(clear).click(function(){