diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index f9d935e..df540e3 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -22,7 +22,6 @@ use Modules\Media\Models\CollectionMapper;
 use Modules\Media\Models\Media;
 use Modules\Media\Theme\Backend\Components\Upload\BaseView;
 use phpOMS\Contract\RenderableInterface;
-use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\Query\OrderType;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
diff --git a/Models/TemplateMapper.php b/Models/TemplateMapper.php
index 4667b9b..0df512d 100755
--- a/Models/TemplateMapper.php
+++ b/Models/TemplateMapper.php
@@ -19,7 +19,6 @@ use Modules\Media\Models\CollectionMapper;
 use Modules\Organization\Models\UnitMapper;
 use Modules\Tag\Models\TagMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
-use phpOMS\DataStorage\Database\Mapper\ReadMapper;
 
 /**
  * Report mapper class.
diff --git a/tests/EventCourse/EventCourse.tpl.php b/tests/EventCourse/EventCourse.tpl.php
index 4b3ef33..9f4abd8 100755
--- a/tests/EventCourse/EventCourse.tpl.php
+++ b/tests/EventCourse/EventCourse.tpl.php
@@ -111,8 +111,8 @@ require 'Worker.php';
                     <tr>
                         <td><?= $key; ?>
                         <td><?= $stype; ?>
-                        <td><?= (\number_format($history = $type[$key][$fiscal_end_prev->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
-                        <td><?= (\number_format($current = $type[$key][$fiscal_end->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
+                        <td><?= (\number_format($history  = $type[$key][$fiscal_end_prev->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
+                        <td><?= (\number_format($current  = $type[$key][$fiscal_end->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
                         <td><?= (\number_format($forecast = ($type[$key][$fiscal_end->format('Y')]['value'] ?? 0.0) / \abs(((int) $fiscal_current->format('m') - ((int) $fiscal_end->format('m') + 1)) % 12 + 1) * 12, 2, ',', '.')); ?>
                         <td><?= \number_format($history == 0 ? 0 : 100 * ($forecast - $history) / $history, 2, ',', '.') . '%'; ?>
                             <?php
@@ -150,8 +150,8 @@ require 'Worker.php';
                     <tr>
                         <td><?= $key; ?>
                         <td><?=  $ccDef[$key]; ?>
-                        <td><?= (\number_format($history = $costcenter[$key][$fiscal_end_prev->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
-                        <td><?= (\number_format($current = $costcenter[$key][$fiscal_end->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
+                        <td><?= (\number_format($history  = $costcenter[$key][$fiscal_end_prev->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
+                        <td><?= (\number_format($current  = $costcenter[$key][$fiscal_end->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
                         <td><?= (\number_format($forecast = ($costcenter[$key][$fiscal_end->format('Y')]['value'] ?? 0.0) / \abs(((int) $fiscal_current->format('m') - ((int) $fiscal_end->format('m') + 1)) % 12 + 1) * 12, 2, ',', '.')); ?>
                         <td><?= \number_format($history == 0 ? 0 : 100 * ($forecast - $history) / $history, 2, ',', '.') . '%'; ?>
                             <?php
@@ -189,8 +189,8 @@ require 'Worker.php';
                     <tr>
                         <td><?= $key; ?>
                         <td><?=  $acDef[$key]; ?>
-                        <td><?= (\number_format($history = $account[$key][$fiscal_end_prev->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
-                        <td><?= (\number_format($current = $account[$key][$fiscal_end->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
+                        <td><?= (\number_format($history  = $account[$key][$fiscal_end_prev->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
+                        <td><?= (\number_format($current  = $account[$key][$fiscal_end->format('Y')]['value'] ?? 0.0, 2, ',', '.')); ?>
                         <td><?= (\number_format($forecast = ($account[$key][$fiscal_end->format('Y')]['value'] ?? 0.0) / \abs(((int) $fiscal_current->format('m') - ((int) $fiscal_end->format('m') + 1)) % 12 + 1) * 12, 2, ',', '.')); ?>
                         <td><?= \number_format($history == 0 ? 0 : 100 * ($forecast - $history) / $history, 2, ',', '.') . '%'; ?>
                             <?php