diff --git a/data/xslt/tei2search_template.xsl b/data/xslt/tei2search_template.xsl
index 79bd12720891195b8cc5eede8475bc126353f0da..428f7bd76e73e7f10b8acf0471264c8bd7d4365f 100644
--- a/data/xslt/tei2search_template.xsl
+++ b/data/xslt/tei2search_template.xsl
@@ -27,7 +27,7 @@
     </xsl:variable>
 
     <xsl:template match="/">
-        <xsl:variable name="all_witness_id" select="distinct-values(//@wit/tokenize(., ' '))"/>
+        <xsl:variable name="all_witness_id" select="distinct-values(//@wit/tokenize(normalize-space(.), ' '))"/>
         <xsl:text>{% extends "base.html.j2" %}</xsl:text>
         <xsl:value-of select="$br"/>
         <xsl:text>{% block css %}</xsl:text>
@@ -62,6 +62,7 @@
                                                 checked=""/>&nbsp;BnFfr 2817</b>
                                     </label>
                                     <xsl:for-each select="$all_witness_id">
+                                        <xsl:sort/>
                                         <xsl:variable name="wit" select="replace(., '#', '')"/>
                                         <label><input type="checkbox" name="fields" value="{$wit}"
                                                 />&nbsp;<xsl:value-of select="$wit"/></label>
diff --git a/templates/search.html.j2 b/templates/search.html.j2
index ca9ba51677f9eccbb6f9d0149943f09a088d96bf..91fd0148815e2748cad2985f830825a3198b4127 100644
--- a/templates/search.html.j2
+++ b/templates/search.html.j2
@@ -14,7 +14,7 @@
             <details class="AdvancedOptions p-4 pt-2 pb-2">
                <summary>Options avancées</summary>
                <form class="options">
-                  <div><b>Chercher dans les manuscrits&nbsp;:</b><label><b><input type="checkbox" name="fields" value="lem" checked="">&nbsp;BnFfr 2817</b></label><label><input type="checkbox" name="fields" value="BnFfr4967">&nbsp;BnFfr4967</label> <label><input type="checkbox" name="fields" value="BnFfr5299">&nbsp;BnFfr5299</label> <label><input type="checkbox" name="fields" value="BnFfr23145">&nbsp;BnFfr23145</label> <label><input type="checkbox" name="fields" value="BnFfr49967">&nbsp;BnFfr49967</label> <label><input type="checkbox" name="fields" value="">&nbsp;</label> <label><input type="checkbox" name="fields" value="Cha514">&nbsp;Cha514</label> <label><input type="checkbox" name="fields" value="BnFfr23146">&nbsp;BnFfr23146</label> <label><input type="checkbox" name="fields" value="BnFfr17274">&nbsp;BnFfr17274</label> <label><input type="checkbox" name="fields" value="Vat966">&nbsp;Vat966</label> <label><input type="checkbox" name="fields" value="Aix419">&nbsp;Aix419</label> <label><input type="checkbox" name="fields" value="BnFfr1724">&nbsp;BnFfr1724</label> <label><input type="checkbox" name="fields" value="Aix966">&nbsp;Aix966</label> </div>
+                  <div><b>Chercher dans les manuscrits&nbsp;:</b><label><b><input type="checkbox" name="fields" value="lem" checked="">&nbsp;BnFfr 2817</b></label><label><input type="checkbox" name="fields" value="Aix419">&nbsp;Aix419</label> <label><input type="checkbox" name="fields" value="Aix966">&nbsp;Aix966</label> <label><input type="checkbox" name="fields" value="BnFfr1724">&nbsp;BnFfr1724</label> <label><input type="checkbox" name="fields" value="BnFfr17274">&nbsp;BnFfr17274</label> <label><input type="checkbox" name="fields" value="BnFfr23145">&nbsp;BnFfr23145</label> <label><input type="checkbox" name="fields" value="BnFfr23146">&nbsp;BnFfr23146</label> <label><input type="checkbox" name="fields" value="BnFfr4967">&nbsp;BnFfr4967</label> <label><input type="checkbox" name="fields" value="BnFfr49967">&nbsp;BnFfr49967</label> <label><input type="checkbox" name="fields" value="BnFfr5299">&nbsp;BnFfr5299</label> <label><input type="checkbox" name="fields" value="Cha514">&nbsp;Cha514</label> <label><input type="checkbox" name="fields" value="Vat966">&nbsp;Vat966</label> </div>
                   <div><b>Élargir la recherche&nbsp;:</b><br><label><input type="checkbox" name="prefix" value="false">
                         Rechercher les mots qui commencent par... (par exemple
                         <code>qui</code> renverra <code>qui</code>,