diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 06e24e3..083304d 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -91,6 +91,7 @@ final class ApiController extends Controller
      */
     public function apiUnitGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        /** @var Unit $unit */
         $unit = UnitMapper::get((int) $request->getData('id'));
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Unit', 'Unit successfully returned.', $unit);
     }
@@ -110,6 +111,7 @@ final class ApiController extends Controller
      */
     public function apiUnitSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        /** @var Unit $old */
         $old = clone UnitMapper::get((int) $request->getData('id'));
         $new = $this->updateUnitFromRequest($request);
         $this->updateModel($request->getHeader()->getAccount(), $old, $new, UnitMapper::class, 'unit');
@@ -127,6 +129,7 @@ final class ApiController extends Controller
      */
     private function updateUnitFromRequest(RequestAbstract $request) : Unit
     {
+        /** @var Unit $unit */
         $unit = UnitMapper::get((int) $request->getData('id'));
         $unit->setName((string) ($request->getData('name') ?? $unit->getName()));
         $unit->setDescriptionRaw((string) ($request->getData('description') ?? $unit->getDescriptionRaw()));
@@ -154,6 +157,7 @@ final class ApiController extends Controller
      */
     public function apiUnitDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        /** @var Unit $unit */
         $unit = UnitMapper::get((int) $request->getData('id'));
         $this->deleteModel($request->getHeader()->getAccount(), $unit, UnitMapper::class, 'unit');
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Unit', 'Unit successfully deleted.', $unit);
@@ -259,6 +263,7 @@ final class ApiController extends Controller
      */
     public function apiPositionGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        /** @var Position $position */
         $position = PositionMapper::get((int) $request->getData('id'));
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Position', 'Position successfully returned.', $position);
     }
@@ -278,6 +283,7 @@ final class ApiController extends Controller
      */
     public function apiPositionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        /** @var Position $position */
         $position = PositionMapper::get((int) $request->getData('id'));
         $this->deleteModel($request->getHeader()->getAccount(), $position, PositionMapper::class, 'position');
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Position', 'Position successfully deleted.', $position);
@@ -298,6 +304,7 @@ final class ApiController extends Controller
      */
     public function apiPositionSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        /** @var Position $old */
         $old = clone PositionMapper::get((int) $request->getData('id'));
         $new = $this->updatePositionFromRequest($request);
         $this->updateModel($request->getHeader()->getAccount(), $old, $new, PositionMapper::class, 'position');
@@ -315,6 +322,7 @@ final class ApiController extends Controller
      */
     private function updatePositionFromRequest(RequestAbstract $request) : Position
     {
+        /** @var Position $position */
         $position = PositionMapper::get((int) $request->getData('id'));
         $position->setName((string) ($request->getData('name') ?? $position->getName()));
         $position->setDescriptionRaw((string) ($request->getData('description') ?? $position->getDescriptionRaw()));
@@ -432,6 +440,7 @@ final class ApiController extends Controller
      */
     public function apiDepartmentGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        /** @var Department $department */
         $department = DepartmentMapper::get((int) $request->getData('id'));
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Department', 'Department successfully returned.', $department);
     }
@@ -451,6 +460,7 @@ final class ApiController extends Controller
      */
     public function apiDepartmentSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        /** @var Department $old */
         $old = clone DepartmentMapper::get((int) $request->getData('id'));
         $new = $this->updateDepartmentFromRequest($request);
         $this->updateModel($request->getHeader()->getAccount(), $old, $new, DepartmentMapper::class, 'department');
@@ -468,6 +478,7 @@ final class ApiController extends Controller
      */
     private function updateDepartmentFromRequest(RequestAbstract $request) : Department
     {
+        /** @var Department $department */
         $department = DepartmentMapper::get((int) $request->getData('id'));
         $department->setName((string) ($request->getData('name') ?? $department->getName()));
         $department->setDescriptionRaw((string) ($request->getData('description') ?? $department->getDescriptionRaw()));
@@ -498,6 +509,7 @@ final class ApiController extends Controller
      */
     public function apiDepartmentDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
+        /** @var Department $department */
         $department = DepartmentMapper::get((int) $request->getData('id'));
         $this->deleteModel($request->getHeader()->getAccount(), $department, DepartmentMapper::class, 'department');
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Department', 'Department successfully deleted.', $department);
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index ef610bf..7e9f5d9 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -57,8 +57,10 @@ final class BackendController extends Controller
 
         if ($request->getData('ptype') === '-') {
             $view->setData('units', UnitMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25));
-        } else {
+        } elseif ($request->getData('ptype') === '+') {
             $view->setData('units', UnitMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
+        } else {
+            $view->setData('units', UnitMapper::getAfterPivot(0, null, 25));
         }
 
         return $view;
@@ -115,14 +117,17 @@ final class BackendController extends Controller
 
         $view->setTemplate('/Modules/Organization/Theme/Backend/organigram');
 
+        /** @var Unit[] $units */
         $units    = UnitMapper::getAll();
         $unitTree = $this->createOrgTree($units);
         $view->setData('unitTree', $unitTree);
 
+        /** @var Department[] $departments */
         $departments = DepartmentMapper::getAll();
         $depTree     = $this->createOrgTree($departments);
         $view->setData('departmentTree', $depTree);
 
+        /** @var Position[] $positions */
         $positions = PositionMapper::getAll();
         $posTree   = $this->createOrgTree($positions);
         $view->setData('positionTree', $posTree);
@@ -168,6 +173,7 @@ final class BackendController extends Controller
                     $tree[$ref][$parent] = ['obj' => null, 'children' => [], 'index' => 0];
                 }
 
+                // For some stupid reason the next line is too complicated for phpstan and the error it creates is insane/wrong!
                 /** @phpstan-ignore-next-line */
                 $tree[$ref][$parent]['children'][] = &$tree[$ref][$component->getId()];
             }
@@ -228,8 +234,10 @@ final class BackendController extends Controller
 
         if ($request->getData('ptype') === '-') {
             $view->setData('departments', DepartmentMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25));
-        } else {
+        } elseif ($request->getData('ptype') === '+') {
             $view->setData('departments', DepartmentMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
+        } else {
+            $view->setData('departments', DepartmentMapper::getAfterPivot(0, null, 25));
         }
 
         return $view;
@@ -320,8 +328,10 @@ final class BackendController extends Controller
 
         if ($request->getData('ptype') === '-') {
             $view->setData('positions', PositionMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25));
-        } else {
+        } elseif ($request->getData('ptype') === '+') {
             $view->setData('positions', PositionMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
+        } else {
+            $view->setData('positions', PositionMapper::getAfterPivot(0, null, 25));
         }
 
         return $view;