diff --git a/templates-contrib/newvc/templates/query_form.ezt b/templates-contrib/newvc/templates/query_form.ezt
index 8060d0ba..ca308012 100644
--- a/templates-contrib/newvc/templates/query_form.ezt
+++ b/templates-contrib/newvc/templates/query_form.ezt
@@ -9,8 +9,9 @@
 <div class="vc_query_form">
   [for query_hidden_values]<input type="hidden" name="[query_hidden_values.name]" value="[query_hidden_values.value]"/>[end]
 <table cellspacing="0" cellpadding="5" class="auto">
-  [is roottype "cvs"]
+  [is roottype "svn"]
   [# For subversion, the branch field is not used ]
+  [else]
   <tr>
     <th style="text-align:right;vertical-align:top;">Branch:</th>
     <td>
diff --git a/templates-contrib/tabbed/templates/query_form.ezt b/templates-contrib/tabbed/templates/query_form.ezt
index 8060d0ba..ca308012 100644
--- a/templates-contrib/tabbed/templates/query_form.ezt
+++ b/templates-contrib/tabbed/templates/query_form.ezt
@@ -9,8 +9,9 @@
 <div class="vc_query_form">
   [for query_hidden_values]<input type="hidden" name="[query_hidden_values.name]" value="[query_hidden_values.value]"/>[end]
 <table cellspacing="0" cellpadding="5" class="auto">
-  [is roottype "cvs"]
+  [is roottype "svn"]
   [# For subversion, the branch field is not used ]
+  [else]
   <tr>
     <th style="text-align:right;vertical-align:top;">Branch:</th>
     <td>
diff --git a/templates/classic/query_form.ezt b/templates/classic/query_form.ezt
index b8b0d7d9..c3ed67b8 100644
--- a/templates/classic/query_form.ezt
+++ b/templates/classic/query_form.ezt
@@ -52,8 +52,9 @@ Browse Directory</a></p>
       </label>
     </td>
   </tr>
-  [is roottype "cvs"]
+  [is roottype "svn"]
   [# For subversion, the branch field is not used ]
+  [else]
   <tr>
     <th style="text-align:right;vertical-align:top;">Branch:</th>
     <td>
diff --git a/templates/default/query_form.ezt b/templates/default/query_form.ezt
index b8b0d7d9..c3ed67b8 100644
--- a/templates/default/query_form.ezt
+++ b/templates/default/query_form.ezt
@@ -52,8 +52,9 @@ Browse Directory</a></p>
       </label>
     </td>
   </tr>
-  [is roottype "cvs"]
+  [is roottype "svn"]
   [# For subversion, the branch field is not used ]
+  [else]
   <tr>
     <th style="text-align:right;vertical-align:top;">Branch:</th>
     <td>