diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index b59c01a..536b949 100755
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 use Modules\Organization\Models\NullDepartment;
 
 $departments = $this->data['departments'] ?? new NullDepartment();
-$isNew = $departments->id === 0;
 
 echo $this->data['nav']->render(); ?>
 
diff --git a/Theme/Backend/department-view.tpl.php b/Theme/Backend/department-view.tpl.php
index 8e92955..85a9fa8 100644
--- a/Theme/Backend/department-view.tpl.php
+++ b/Theme/Backend/department-view.tpl.php
@@ -195,7 +195,7 @@ echo $this->data['nav']->render();
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $value->id; ?></a>
 
-                                <td><a href="<?= $url; ?>"><?= $this->printHtml($value->project->name); ?></a>
+                                <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                             <?php endforeach; ?>
                             <?php if ($c === 0) : ?>
                             <tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/risk-view.tpl.php b/Theme/Backend/risk-view.tpl.php
index f0df42b..9034570 100644
--- a/Theme/Backend/risk-view.tpl.php
+++ b/Theme/Backend/risk-view.tpl.php
@@ -71,7 +71,7 @@ echo $this->data['nav']->render(); ?>
                                         <option value="">
                                         <?php
                                         foreach ($this->data['categories'] as $category) : ?>
-                                            <option value="<?= $category->id; ?>"<?= $category->id === $risk->category->id ? ' selected' : ''; ?>><?= $this->printHtml($category->getL11n()); ?>
+                                            <option value="<?= $category->id; ?>"<?= $category->id === $risk->category?->id ? ' selected' : ''; ?>><?= $this->printHtml($category->getL11n()); ?>
                                         <?php endforeach; ?>
                                     </select>
                                 </div>
@@ -82,7 +82,7 @@ echo $this->data['nav']->render(); ?>
                                         <option value="">
                                         <?php
                                         foreach ($this->data['departments'] as $department) : ?>
-                                            <option value="<?= $department->id; ?>"<?= $department->id === $risk->department->id ? ' selected' : ''; ?>><?= $this->printHtml($department->name); ?>
+                                            <option value="<?= $department->id; ?>"<?= $department->id === $risk->department?->id ? ' selected' : ''; ?>><?= $this->printHtml($department->name); ?>
                                         <?php endforeach; ?>
                                     </select>
                                 </div>
@@ -93,7 +93,7 @@ echo $this->data['nav']->render(); ?>
                                         <option value="">
                                         <?php
                                         foreach ($this->data['processes'] as $process) : ?>
-                                            <option value="<?= $process->id; ?>"<?= $process->id === $risk->process->id ? ' selected' : ''; ?>><?= $this->printHtml($process->title); ?>
+                                            <option value="<?= $process->id; ?>"<?= $process->id === $risk->process?->id ? ' selected' : ''; ?>><?= $this->printHtml($process->title); ?>
                                         <?php endforeach; ?>
                                     </select>
                                 </div>