diff --git a/src/DataTables/PartsDataTable.php b/src/DataTables/PartsDataTable.php
index fe17453c..06574c97 100644
--- a/src/DataTables/PartsDataTable.php
+++ b/src/DataTables/PartsDataTable.php
@@ -31,6 +31,7 @@ use App\DataTables\Column\LocaleDateTimeColumn;
 use App\DataTables\Column\MarkdownColumn;
 use App\DataTables\Column\PartAttachmentsColumn;
 use App\DataTables\Column\TagsColumn;
+use App\Entity\LogSystem\AbstractLogEntry;
 use App\Entity\Parts\Category;
 use App\Entity\Parts\Footprint;
 use App\Entity\Parts\Manufacturer;
@@ -44,6 +45,7 @@ use App\Services\EntityURLGenerator;
 use App\Services\Trees\NodesListBuilder;
 use Doctrine\ORM\QueryBuilder;
 use Omines\DataTablesBundle\Adapter\Doctrine\ORM\SearchCriteriaProvider;
+use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapter;
 use Omines\DataTablesBundle\Column\BoolColumn;
 use Omines\DataTablesBundle\Column\MapColumn;
 use Omines\DataTablesBundle\Column\TextColumn;
@@ -215,7 +217,8 @@ final class PartsDataTable implements DataTableTypeInterface
                 'visible' => false,
             ])
 
-            ->addOrderBy('name')
+            ->addOrderBy('name');
+            /**
             ->createAdapter(FetchJoinORMAdapter::class, [
                 'simple_total_query' => true,
                 'query' => function (QueryBuilder $builder): void {
@@ -228,22 +231,19 @@ final class PartsDataTable implements DataTableTypeInterface
                     },
                     new SearchCriteriaProvider(),
                 ],
+            ]); **/
+
+            $dataTable->createAdapter(ORMAdapter::class, [
+                'entity' => Part::class,
+                'query' => function (QueryBuilder $builder): void {
+                    $this->getQuery($builder);
+                },
             ]);
     }
 
     protected function getQuery(QueryBuilder $builder): void
     {
         $builder->distinct()->select('part')
-            ->addSelect('category')
-            ->addSelect('footprint')
-            ->addSelect('manufacturer')
-            ->addSelect('partUnit')
-            ->addSelect('master_picture_attachment')
-            ->addSelect('footprint_attachment')
-            ->addSelect('partLots')
-            ->addSelect('orderdetails')
-            ->addSelect('attachments')
-            ->addSelect('storelocations')
             ->from(Part::class, 'part')
             ->leftJoin('part.category', 'category')
             ->leftJoin('part.master_picture_attachment', 'master_picture_attachment')