diff --git a/library/Class/CodifAnnexe.php b/library/Class/CodifAnnexe.php
index a88908e2c1352f8dfc406896bf9264258e799c0d..bfc268dd6ca55e157490c3c9cee584bbe5754b18 100644
--- a/library/Class/CodifAnnexe.php
+++ b/library/Class/CodifAnnexe.php
@@ -93,17 +93,20 @@ class Class_CodifAnnexe extends Storm_Model_Abstract {
                                   'no_pickup' => 0,
                                   'date_maj' => ''];
 
-
-  protected $_belongs_to = [
-    'bib' => ['model' => 'Class_Bib',
-              'referenced_in' => 'id_bib'],
-
-    'int_bib' => ['through' => 'bib']];
-
-
-  public static function facetLabelFor($id) {
-    return ($annexe = static::findFirstBy(['code' => addslashes($id)]))
-      ? $annexe->getLibelle()
+  protected $_belongs_to = ['bib' => ['model' => 'Class_Bib',
+                                      'referenced_in' => 'id_bib'],
+                            'int_bib' => ['through' => 'bib']];
+
+  public static function facetLabelFor(string $id): string
+  {
+    $rows = static::query()
+      ->select('libelle')
+      ->eq('code', addslashes($id))
+      ->beBasic()
+      ->fetchFirst();
+
+    return $rows
+      ? ($rows['libelle'] ?? '')
       : '';
   }
 
diff --git a/library/Class/CodifDewey.php b/library/Class/CodifDewey.php
index e9c13058372d8ee6e4c5cf1d9494939532067791..0e35b20580c42376ddaaa68d56e6cee891f30bd9 100644
--- a/library/Class/CodifDewey.php
+++ b/library/Class/CodifDewey.php
@@ -125,13 +125,6 @@ class Class_CodifDeweyLoader extends Storm_Model_Loader {
   }
 
 
-  public function getLibelleOf($indice) {
-    return ($dewey = Class_CodifDewey::find($indice))
-      ? $dewey->getLibelle()
-      : Class_CodifDewey::newInstance(['id_dewey' => $indice])->formatIndice();
-  }
-
-
   public function getIndices(string $pere) : array {
     $query = Class_CodifDewey::query()
       ->eq(Storm_Query_Key::length('id_dewey'),
@@ -177,9 +170,11 @@ class Class_CodifDewey extends Storm_Model_Abstract {
   protected $_loader_class = 'Class_CodifDeweyLoader';
   protected $_fixed_id = true;
 
-
-  public static function facetLabelFor($id) {
-    return static::getLoader()->getLibelleOf($id);
+  public static function facetLabelFor(string $id): string
+  {
+    return ($label = parent::facetLabelFor($id))
+      ? $label
+      : Class_CodifDewey::newInstance(['id_dewey' => $id])->formatIndice();
   }
 
 
diff --git a/library/Class/CodifLangue.php b/library/Class/CodifLangue.php
index 81473d079056a2033f85968f41537a1bed484f00..b0d98e5986431e0669880ce7efe3b74d70f71866 100644
--- a/library/Class/CodifLangue.php
+++ b/library/Class/CodifLangue.php
@@ -69,14 +69,6 @@ class Class_CodifLangue extends Storm_Model_Abstract {
   }
 
 
-  public static function facetLabelFor($id) {
-    return ($model = static::find($id))
-      ? $model->getLibelle()
-      : '';
-  }
-
-
-
   public function getCategorie() {
     return;
   }
diff --git a/library/Class/CodifPcdm4.php b/library/Class/CodifPcdm4.php
index 855d8c0df805a0383e6451eb0e05c08bfbfb6bf6..8da629d141f3fdeb00c519b98eda02f6219fa4c1 100644
--- a/library/Class/CodifPcdm4.php
+++ b/library/Class/CodifPcdm4.php
@@ -88,13 +88,6 @@ class Class_CodifPcdm4Loader extends Storm_Model_Loader {
   }
 
 
-  public function getLibelleOf($indice) {
-    return ($pcdm4 = Class_CodifPcdm4::find($indice))
-      ? $pcdm4->getLibelle()
-      : $indice;
-  }
-
-
   public function filtreIndice($indice) {
     $indice=trim($indice);
     if(!is_numeric(substr($indice,0,1)))
@@ -156,9 +149,11 @@ class Class_CodifPcdm4 extends Storm_Model_Abstract {
     $_loader_class = 'Class_CodifPcdm4Loader',
     $_fixed_id = true;
 
-
-  public static function facetLabelFor($id) {
-    return static::getLoader()->getLibelleOf($id);
+  public static function facetLabelFor(string $id): string
+  {
+    return ($label = parent::facetLabelFor($id))
+      ? $label
+      : $id;
   }
 
 
diff --git a/library/Class/CodifThesaurus.php b/library/Class/CodifThesaurus.php
index 82de5e8004729af94551f9f6bb4de669a30b5b48..d04a47894678b03c756040ae1caa607f82372178 100644
--- a/library/Class/CodifThesaurus.php
+++ b/library/Class/CodifThesaurus.php
@@ -48,10 +48,18 @@ class Class_CodifThesaurus extends Storm_Model_Abstract {
 
   protected $_list_rules;
 
-  public static function facetLabelFor($id) {
-    return ($thesaurus = static::getLoader()->findFirstBy(['id_thesaurus' => $id]))
-      ? $thesaurus->getLibelleFacette()
-      : '';
+  public static function facetLabelFor(string $id): string
+  {
+    if ( ! ($rows = static::query()
+            ->select(['libelle_facette', 'libelle'])
+            ->eq('id_thesaurus', $id)
+            ->beBasic()
+            ->fetchFirst()))
+      return '';
+
+    return ($label = $rows['libelle_facette'] ?? '')
+      ? $label
+      : $rows['libelle'] ?? '';
   }
 
 
diff --git a/library/Class/TypeDoc.php b/library/Class/TypeDoc.php
index 87b3a2ab5f04028aa6ba2081a28c349dd0f42803..acd47aa6f1965228332327554bbf5a726a32d26d 100644
--- a/library/Class/TypeDoc.php
+++ b/library/Class/TypeDoc.php
@@ -337,6 +337,8 @@ class Class_TypeDoc extends Storm_Model_Abstract {
   protected $_belongs_to = ['codif_type_doc' =>
                             ['model' => 'Class_CodifTypeDoc',
                              'referenced_in' => 'id' ]];
+  protected string $_label_field = 'label';
+
   const
     UNKNOWN = 0,
     LIVRE = 1,
@@ -367,7 +369,6 @@ class Class_TypeDoc extends Storm_Model_Abstract {
     SOUNDCLOUD = 117,
     CITEDELAMUSIQUE = 119;
 
-
   public static function getDefaultTypeDocs() {
     $instance = new Class_TypeDoc;
     return [self::LIVRE => $instance->_('Livres'),
@@ -463,13 +464,6 @@ class Class_TypeDoc extends Storm_Model_Abstract {
   }
 
 
-  public static function facetLabelFor($id) {
-    return ($type_doc = static::find($id))
-      ? $type_doc->getLabel()
-      : '';
-  }
-
-
   public function getCodifTypeDoc() {
     if ($codif=parent::_get('codif_type_doc'))
       return $codif;
diff --git a/library/Trait/Facetable.php b/library/Trait/Facetable.php
index 2c284bc19ca88d670cca80df2ea248aab07e6a41..11445167db13b7981007abe50833b92603efe811 100644
--- a/library/Trait/Facetable.php
+++ b/library/Trait/Facetable.php
@@ -20,11 +20,21 @@
  */
 
 
-trait Trait_Facetable {
-  /** @return string */
-  public static function facetLabelFor($id) {
-    return ($model = static::find((int)$id))
-      ? $model->getLibelle()
+trait Trait_Facetable
+{
+
+  protected string $_label_field = 'libelle';
+
+  public static function facetLabelFor(string $id): string
+  {
+    $rows = static::query()
+      ->select($this->_label_field)
+      ->eq($this->_table_primary, $id)
+      ->beBasic()
+      ->fetchFirst();
+
+    return $rows
+      ? ($rows[$this->_label_field] ?? '')
       : '';
   }
 
@@ -38,4 +48,4 @@ trait Trait_Facetable {
   public function getFacetCode() {
     return $this->asFacet();
   }
-}
\ No newline at end of file
+}