diff --git a/ippisite/ippidb/templates/compound_list.html b/ippisite/ippidb/templates/compound_list.html
index c4c831eb605fdb9f014dbe0d3b7eb66663671091..8d6a65a5c4a4d52de039aa323e07eb585edfa82d 100644
--- a/ippisite/ippidb/templates/compound_list.html
+++ b/ippisite/ippidb/templates/compound_list.html
@@ -91,25 +91,7 @@
             {% include "compound_l_item.html" with compound=compound %}
         {% endfor %}
     {% else %}
-        <table class="table">
-            <thead>
-                <tr>
-                    <th scope="col">#</th>
-                    <th scope="col">Common name</th>
-                    <th scope="col">Molecular weight</th>
-                    <th scope="col">AlogP</th>
-                    <th scope="col">PDB ligand</th>
-                    <th scope="col">MDDR phase</th>
-                    <th scope="col">Available tests</th>
-                    <th scope="col">Available publications</th>
-                </tr>
-          </thead>
-          <tbody>
-        {% for compound in compounds %}
-            {% include "compound_t_item.html" with compound=compound %}
-        {% endfor %}
-          </tbody>
-          </table>
+        {% include "compound_t_list.html" with compounds=compounds %}
     {% endif %}
     </div>
 {% else %}
diff --git a/ippisite/ippidb/templates/compound_t_list.html b/ippisite/ippidb/templates/compound_t_list.html
index 57faae8504e2a6b66973f35bcc08e0bf1f2a3e43..ec6da9dc1ccba090e09d7629315c4e2ec96d7c2d 100644
--- a/ippisite/ippidb/templates/compound_t_list.html
+++ b/ippisite/ippidb/templates/compound_t_list.html
@@ -1,10 +1,28 @@
-<tr>
-    <th scope="col"><span class="badge badge-dark"><a href="/compound/{{ compound.id }}">{{ compound.id }}</a></span></th>
-    <th scope="col">{{ compound.common_name|default_if_none:"-" }}</th>
-    <th scope="col">{{ compound.molecular_weight}}  g/mol</th>
-    <th scope="col">{{ compound.a_log_p }}</th>
-    <th scope="col">{% for pdb_id in compound.compound_action_pdb_ids %}{{ pdb_id }}{% endfor %}</th>
-    <th scope="col"> ? </th>
-    <th scope="col"> ? </th>
-    <th scope="col">{{ compound.biblio_refs|length }}</th>
-</tr>
+<table class="table">
+  <thead>
+    <tr>
+      <th scope="col">#</th>
+      <th scope="col">Common name</th>
+      <th scope="col">Molecular weight</th>
+      <th scope="col">AlogP</th>
+      <th scope="col">PDB ligand</th>
+      <th scope="col">MDDR phase</th>
+      <th scope="col">Available tests</th>
+      <th scope="col">Available publications</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for compound in compounds %}
+      <tr>
+        <th scope="col"><span class="badge badge-dark"><a href="/compound/{{ compound.id }}">{{ compound.id }}</a></span></th>
+        <th scope="col">{{ compound.common_name|default_if_none:"-" }}</th>
+        <th scope="col">{{ compound.molecular_weight}}  g/mol</th>
+        <th scope="col">{{ compound.a_log_p }}</th>
+        <th scope="col">{% for pdb_id in compound.compound_action_pdb_ids %}{{ pdb_id }}{% endfor %}</th>
+        <th scope="col"> ? </th>
+        <th scope="col"> ? </th>
+        <th scope="col">{{ compound.biblio_refs|length }}</th>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>