diff --git a/src/Controller/PartListsController.php b/src/Controller/PartListsController.php
index 4974af46..91a149ea 100644
--- a/src/Controller/PartListsController.php
+++ b/src/Controller/PartListsController.php
@@ -65,11 +65,13 @@ class PartListsController extends AbstractController
 {
     private $entityManager;
     private $nodesListBuilder;
+    private $dataTableFactory;
 
-    public function __construct(EntityManagerInterface $entityManager, NodesListBuilder $nodesListBuilder)
+    public function __construct(EntityManagerInterface $entityManager, NodesListBuilder $nodesListBuilder, DataTableFactory $dataTableFactory)
     {
         $this->entityManager = $entityManager;
         $this->nodesListBuilder = $nodesListBuilder;
+        $this->dataTableFactory = $dataTableFactory;
     }
 
     /**
@@ -123,35 +125,60 @@ class PartListsController extends AbstractController
     }
 
     /**
-     * @Route("/category/{id}/parts", name="part_list_category")
-     *
-     * @return JsonResponse|Response
+     * Common implementation for the part list pages.
+     * @param  string  $template The template that should be rendered
+     * @param  array  $additonal_template_vars Any additional template variables that should be passed to the template
+     * @param  callable  $filter_changer A function that is called with the filter object as parameter. This function can be used to customize the filter
+     * @param  callable  $form_changer A function that is called with the form object as parameter. This function can be used to customize the form
+     * @return Response
      */
-    public function showCategory(Category $category, Request $request, DataTableFactory $dataTable)
+    protected function showListWithFilter(Request $request, string $template, ?callable $filter_changer = null, ?callable $form_changer = null, array $additonal_template_vars = []): Response
     {
         $formRequest = clone $request;
         $formRequest->setMethod('GET');
         $filter = new PartFilter($this->nodesListBuilder);
+        if($filter_changer !== null){
+            $filter_changer($filter);
+        }
 
-        //Set the category as default filter and disable to change that constraint value
-        $filter->getCategory()->setOperator('INCLUDING_CHILDREN')->setValue($category);
         $filterForm = $this->createForm(PartFilterType::class, $filter, ['method' => 'GET']);
-        $this->disableFormFieldAfterCreation($filterForm->get('category')->get('value'));
+        if($form_changer !== null) {
+            $form_changer($filterForm);
+        }
+
         $filterForm->handleRequest($formRequest);
 
-        $table = $dataTable->createFromType(PartsDataTable::class, ['filter' => $filter])
+        $table = $this->dataTableFactory->createFromType(PartsDataTable::class, ['filter' => $filter])
             ->handleRequest($request);
 
         if ($table->isCallback()) {
             return $table->getResponse();
         }
 
-        return $this->render('Parts/lists/category_list.html.twig', [
+        return $this->render($template, array_merge([
             'datatable' => $table,
-            'entity' => $category,
-            'repo' => $this->entityManager->getRepository(Category::class),
             'filterForm' => $filterForm->createView(),
-        ]);
+        ], $additonal_template_vars));
+    }
+
+    /**
+     * @Route("/category/{id}/parts", name="part_list_category")
+     *
+     * @return JsonResponse|Response
+     */
+    public function showCategory(Category $category, Request $request)
+    {
+        return $this->showListWithFilter($request,
+            'Parts/lists/category_list.html.twig',
+            function (PartFilter $filter) use ($category) {
+                $filter->getCategory()->setOperator('INCLUDING_CHILDREN')->setValue($category);
+            }, function (FormInterface $filterForm) {
+                $this->disableFormFieldAfterCreation($filterForm->get('category')->get('value'));
+            }, [
+                'entity' => $category,
+                'repo' => $this->entityManager->getRepository(Category::class),
+            ]
+        );
     }
 
     /**
@@ -159,20 +186,19 @@ class PartListsController extends AbstractController
      *
      * @return JsonResponse|Response
      */
-    public function showFootprint(Footprint $footprint, Request $request, DataTableFactory $dataTable)
+    public function showFootprint(Footprint $footprint, Request $request)
     {
-        $table = $dataTable->createFromType(PartsDataTable::class, ['footprint' => $footprint])
-            ->handleRequest($request);
-
-        if ($table->isCallback()) {
-            return $table->getResponse();
-        }
-
-        return $this->render('Parts/lists/footprint_list.html.twig', [
-            'datatable' => $table,
-            'entity' => $footprint,
-            'repo' => $this->entityManager->getRepository(Footprint::class),
-        ]);
+        return $this->showListWithFilter($request,
+            'Parts/lists/footprint_list.html.twig',
+            function (PartFilter $filter) use ($footprint) {
+                $filter->getFootprint()->setOperator('INCLUDING_CHILDREN')->setValue($footprint);
+            }, function (FormInterface $filterForm) {
+                $this->disableFormFieldAfterCreation($filterForm->get('footprint')->get('value'));
+            }, [
+                'entity' => $footprint,
+                'repo' => $this->entityManager->getRepository(Footprint::class),
+            ]
+        );
     }
 
     /**
@@ -180,20 +206,19 @@ class PartListsController extends AbstractController
      *
      * @return JsonResponse|Response
      */
-    public function showManufacturer(Manufacturer $manufacturer, Request $request, DataTableFactory $dataTable)
+    public function showManufacturer(Manufacturer $manufacturer, Request $request)
     {
-        $table = $dataTable->createFromType(PartsDataTable::class, ['manufacturer' => $manufacturer])
-            ->handleRequest($request);
-
-        if ($table->isCallback()) {
-            return $table->getResponse();
-        }
-
-        return $this->render('Parts/lists/manufacturer_list.html.twig', [
-            'datatable' => $table,
-            'entity' => $manufacturer,
-            'repo' => $this->entityManager->getRepository(Manufacturer::class),
-        ]);
+        return $this->showListWithFilter($request,
+            'Parts/lists/manufacturer_list.html.twig',
+            function (PartFilter $filter) use ($manufacturer) {
+                $filter->getManufacturer()->setOperator('INCLUDING_CHILDREN')->setValue($manufacturer);
+            }, function (FormInterface $filterForm) {
+                $this->disableFormFieldAfterCreation($filterForm->get('manufacturer')->get('value'));
+            }, [
+                'entity' => $manufacturer,
+                'repo' => $this->entityManager->getRepository(Manufacturer::class),
+            ]
+        );
     }
 
     /**
@@ -201,20 +226,19 @@ class PartListsController extends AbstractController
      *
      * @return JsonResponse|Response
      */
-    public function showStorelocation(Storelocation $storelocation, Request $request, DataTableFactory $dataTable)
+    public function showStorelocation(Storelocation $storelocation, Request $request)
     {
-        $table = $dataTable->createFromType(PartsDataTable::class, ['storelocation' => $storelocation])
-            ->handleRequest($request);
-
-        if ($table->isCallback()) {
-            return $table->getResponse();
-        }
-
-        return $this->render('Parts/lists/store_location_list.html.twig', [
-            'datatable' => $table,
-            'entity' => $storelocation,
-            'repo' => $this->entityManager->getRepository(Storelocation::class),
-        ]);
+        return $this->showListWithFilter($request,
+            'Parts/lists/store_location_list.html.twig',
+            function (PartFilter $filter) use ($storelocation) {
+                $filter->getStorelocation()->setOperator('INCLUDING_CHILDREN')->setValue($storelocation);
+            }, function (FormInterface $filterForm) {
+                $this->disableFormFieldAfterCreation($filterForm->get('storelocation')->get('value'));
+            }, [
+                'entity' => $storelocation,
+                'repo' => $this->entityManager->getRepository(Storelocation::class),
+            ]
+        );
     }
 
     /**
@@ -222,20 +246,19 @@ class PartListsController extends AbstractController
      *
      * @return JsonResponse|Response
      */
-    public function showSupplier(Supplier $supplier, Request $request, DataTableFactory $dataTable)
+    public function showSupplier(Supplier $supplier, Request $request)
     {
-        $table = $dataTable->createFromType(PartsDataTable::class, ['supplier' => $supplier])
-            ->handleRequest($request);
-
-        if ($table->isCallback()) {
-            return $table->getResponse();
-        }
-
-        return $this->render('Parts/lists/supplier_list.html.twig', [
-            'datatable' => $table,
-            'entity' => $supplier,
-            'repo' => $this->entityManager->getRepository(Supplier::class),
-        ]);
+        return $this->showListWithFilter($request,
+            'Parts/lists/supplier_list.html.twig',
+            function (PartFilter $filter) use ($supplier) {
+                $filter->getSupplier()->setOperator('INCLUDING_CHILDREN')->setValue($supplier);
+            }, function (FormInterface $filterForm) {
+                $this->disableFormFieldAfterCreation($filterForm->get('supplier')->get('value'));
+            }, [
+                'entity' => $supplier,
+                'repo' => $this->entityManager->getRepository(Supplier::class),
+            ]
+        );
     }
 
     /**
@@ -246,17 +269,17 @@ class PartListsController extends AbstractController
     public function showTag(string $tag, Request $request, DataTableFactory $dataTable)
     {
         $tag = trim($tag);
-        $table = $dataTable->createFromType(PartsDataTable::class, ['tag' => $tag])
-            ->handleRequest($request);
 
-        if ($table->isCallback()) {
-            return $table->getResponse();
-        }
-
-        return $this->render('Parts/lists/tags_list.html.twig', [
-            'tag' => $tag,
-            'datatable' => $table,
-        ]);
+        return $this->showListWithFilter($request,
+            'Parts/lists/tags_list.html.twig',
+            function (PartFilter $filter) use ($tag) {
+                $filter->getTags()->setOperator('ANY')->setValue($tag);
+            }, function (FormInterface $filterForm) {
+                $this->disableFormFieldAfterCreation($filterForm->get('tags')->get('value'));
+            }, [
+                'tag' => $tag,
+            ]
+        );
     }
 
     /**
@@ -304,22 +327,6 @@ class PartListsController extends AbstractController
      */
     public function showAll(Request $request, DataTableFactory $dataTable)
     {
-
-        $formRequest = clone $request;
-        $formRequest->setMethod('GET');
-        $filter = new PartFilter($this->nodesListBuilder);
-        $filterForm = $this->createForm(PartFilterType::class, $filter, ['method' => 'GET']);
-        $filterForm->handleRequest($formRequest);
-
-        $table = $dataTable->createFromType(PartsDataTable::class, [
-            'filter' => $filter,
-        ])
-            ->handleRequest($request);
-
-        if ($table->isCallback()) {
-            return $table->getResponse();
-        }
-
-        return $this->render('Parts/lists/all_list.html.twig', ['datatable' => $table, 'filterForm' => $filterForm->createView()]);
+        return $this->showListWithFilter($request,'Parts/lists/all_list.html.twig');
     }
 }
diff --git a/src/DataTables/PartsDataTable.php b/src/DataTables/PartsDataTable.php
index 53150ab3..4f06bc82 100644
--- a/src/DataTables/PartsDataTable.php
+++ b/src/DataTables/PartsDataTable.php
@@ -370,57 +370,12 @@ final class PartsDataTable implements DataTableTypeInterface
 
     private function buildCriteria(QueryBuilder $builder, array $options): void
     {
-
+        //We do the most stuff here in the filter class
         if (isset($options['filter']) && $options['filter'] instanceof PartFilter) {
             $filter = $options['filter'];
-
             $filter->apply($builder);
         }
 
-        if (isset($options['category'])) {
-            $category = $options['category'];
-            $list = $this->treeBuilder->typeToNodesList(Category::class, $category);
-            $list[] = $category;
-
-            $builder->andWhere('part.category IN (:cid)')->setParameter('cid', $list);
-        }
-
-        if (isset($options['footprint'])) {
-            $category = $options['footprint'];
-            $list = $this->treeBuilder->typeToNodesList(Footprint::class, $category);
-            $list[] = $category;
-
-            $builder->andWhere('part.footprint IN (:cid)')->setParameter('cid', $list);
-        }
-
-        if (isset($options['manufacturer'])) {
-            $category = $options['manufacturer'];
-            $list = $this->treeBuilder->typeToNodesList(Manufacturer::class, $category);
-            $list[] = $category;
-
-            $builder->andWhere('part.manufacturer IN (:cid)')->setParameter('cid', $list);
-        }
-
-        if (isset($options['storelocation'])) {
-            $location = $options['storelocation'];
-            $list = $this->treeBuilder->typeToNodesList(Storelocation::class, $location);
-            $list[] = $location;
-
-            $builder->andWhere('partLots.storage_location IN (:cid)')->setParameter('cid', $list);
-        }
-
-        if (isset($options['supplier'])) {
-            $supplier = $options['supplier'];
-            $list = $this->treeBuilder->typeToNodesList(Supplier::class, $supplier);
-            $list[] = $supplier;
-
-            $builder->andWhere('orderdetails.supplier IN (:cid)')->setParameter('cid', $list);
-        }
-
-        if (isset($options['tag'])) {
-            $builder->andWhere('part.tags LIKE :tag')->setParameter('tag', $options['tag']);
-        }
-
         if (!empty($options['search'])) {
             if (!$options['search_options']['regex']) {
                 //Dont show results, if no things are selected
diff --git a/templates/Parts/lists/tags_list.html.twig b/templates/Parts/lists/tags_list.html.twig
index dac3d63b..90a1f9f0 100644
--- a/templates/Parts/lists/tags_list.html.twig
+++ b/templates/Parts/lists/tags_list.html.twig
@@ -6,6 +6,12 @@
 
 {% block content %}
 
+    <div class="accordion mb-3">
+        {% include "Parts/lists/_filter.html.twig" %}
+    </div>
+
+    {% include "Parts/lists/_action_bar.html.twig" with {'url_options': {}} %}
+
     {% include "Parts/lists/_parts_list.html.twig" %}
 
 {% endblock %}