diff --git a/Theme/Backend/category-list.tpl.php b/Theme/Backend/category-list.tpl.php
index b8a5e9c..f503850 100644
--- a/Theme/Backend/category-list.tpl.php
+++ b/Theme/Backend/category-list.tpl.php
@@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
-                        <?php $c = 0; foreach ($categories as $key => $value) : $c++;
+                        <?php $c = 0; foreach ($categories as $key => $value) : ++$c;
                         $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/cause-list.tpl.php b/Theme/Backend/cause-list.tpl.php
index 178c186..9927598 100644
--- a/Theme/Backend/cause-list.tpl.php
+++ b/Theme/Backend/cause-list.tpl.php
@@ -26,7 +26,7 @@ echo $this->getData('nav')->render(); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
-                        <?php $c = 0; foreach ($causes as $key => $value) : $c++;
+                        <?php $c = 0; foreach ($causes as $key => $value) : ++$c;
                         $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php
index 5918242..cd64143 100644
--- a/Theme/Backend/cockpit.tpl.php
+++ b/Theme/Backend/cockpit.tpl.php
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
                 <tfoot>
                 <tr><td colspan="6">
                 <tbody>
-                <?php $c = 0; foreach ([] as $key => $value) : $c++;
+                <?php $c = 0; foreach ([] as $key => $value) : ++$c;
                 $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); ?>
                 <tr>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index 7bf3335..f54e3bc 100644
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
-                        <?php $c = 0; foreach ($departments as $key => $value) : $c++;
+                        <?php $c = 0; foreach ($departments as $key => $value) : ++$c;
                         $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/department/single?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/department-single.tpl.php b/Theme/Backend/department-single.tpl.php
index cbb8076..b07fa16 100644
--- a/Theme/Backend/department-single.tpl.php
+++ b/Theme/Backend/department-single.tpl.php
@@ -109,7 +109,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="5">
                                     <tbody>
-                                    <?php $c = 0; foreach ($risks as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($risks as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -140,7 +140,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
-                                    <?php $c = 0; foreach ($categories as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($categories as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -168,7 +168,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
-                                    <?php $c = 0; foreach ($projects as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($projects as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -196,7 +196,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
-                                    <?php $c = 0; foreach ($processes as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($processes as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -225,7 +225,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
-                                    <?php $c = 0; foreach ($causes as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($causes as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -256,7 +256,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="4">
                                     <tbody>
-                                    <?php $c = 0; foreach ($solutions as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($solutions as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/process-list.tpl.php b/Theme/Backend/process-list.tpl.php
index 4a1de43..33b0cee 100644
--- a/Theme/Backend/process-list.tpl.php
+++ b/Theme/Backend/process-list.tpl.php
@@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
-                        <?php $c = 0; foreach ($processes as $key => $value) : $c++;
+                        <?php $c = 0; foreach ($processes as $key => $value) : ++$c;
                         $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/project-list.tpl.php b/Theme/Backend/project-list.tpl.php
index 7f82f1c..5c33f62 100644
--- a/Theme/Backend/project-list.tpl.php
+++ b/Theme/Backend/project-list.tpl.php
@@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
-                        <?php $c = 0; foreach ($projects as $key => $value) : $c++;
+                        <?php $c = 0; foreach ($projects as $key => $value) : ++$c;
                         $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/risk-list.tpl.php b/Theme/Backend/risk-list.tpl.php
index 143f024..4520b9b 100644
--- a/Theme/Backend/risk-list.tpl.php
+++ b/Theme/Backend/risk-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
                         <tfoot>
                 <tr><td colspan="5">
                         <tbody>
-                        <?php $c = 0; foreach ($risks as $key => $value) : $c++;
+                        <?php $c = 0; foreach ($risks as $key => $value) : ++$c;
                         $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/risk/single?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/solution-list.tpl.php b/Theme/Backend/solution-list.tpl.php
index 20c1873..c2363bd 100644
--- a/Theme/Backend/solution-list.tpl.php
+++ b/Theme/Backend/solution-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
                         <tfoot>
                 <tr><td colspan="4">
                         <tbody>
-                        <?php $c = 0; foreach ($solutions as $key => $value) : $c++;
+                        <?php $c = 0; foreach ($solutions as $key => $value) : ++$c;
                         $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php
index b0a9a56..0b924dd 100644
--- a/Theme/Backend/unit-list.tpl.php
+++ b/Theme/Backend/unit-list.tpl.php
@@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
-                        <?php $c = 0; foreach ($units as $key => $value) : $c++;
+                        <?php $c = 0; foreach ($units as $key => $value) : ++$c;
                         $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/unit/single?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
diff --git a/Theme/Backend/unit-single.tpl.php b/Theme/Backend/unit-single.tpl.php
index dc44ba9..812afde 100644
--- a/Theme/Backend/unit-single.tpl.php
+++ b/Theme/Backend/unit-single.tpl.php
@@ -110,7 +110,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="5">
                                     <tbody>
-                                    <?php $c = 0; foreach ($risks as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($risks as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -141,7 +141,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
-                                    <?php $c = 0; foreach ($departments as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($departments as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/department/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -169,7 +169,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
-                                    <?php $c = 0; foreach ($categories as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($categories as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -197,7 +197,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
-                                    <?php $c = 0; foreach ($projects as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($projects as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -225,7 +225,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
-                                    <?php $c = 0; foreach ($processes as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($processes as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -254,7 +254,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
-                                    <?php $c = 0; foreach ($causes as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($causes as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@@ -285,7 +285,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tfoot>
                             <tr><td colspan="4">
                                     <tbody>
-                                    <?php $c = 0; foreach ($solutions as $key => $value) : $c++;
+                                    <?php $c = 0; foreach ($solutions as $key => $value) : ++$c;
                                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>