diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php
index a0d221b..a0b0fdd 100644
--- a/Theme/Backend/cockpit.tpl.php
+++ b/Theme/Backend/cockpit.tpl.php
@@ -44,7 +44,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="6"><?= $footerView->render(); ?>
                 <tbody>
                 <?php $c = 0; foreach ([] as $key => $value) : $c++;
-                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}id=' . $value->getId()); ?>
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
                 <tr>
                     <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
diff --git a/Theme/Backend/risk-create.tpl.php b/Theme/Backend/risk-create.tpl.php
index 2a85546..fb1e258 100644
--- a/Theme/Backend/risk-create.tpl.php
+++ b/Theme/Backend/risk-create.tpl.php
@@ -34,7 +34,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('Risk'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iName"><?= $this->getText('Name'); ?></label>
@@ -106,7 +106,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('RiskStatus'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iRiskConsequence"><?= $this->getText('RiskConsequence'); ?></label>
@@ -161,7 +161,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('RiskObjects'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iRiskObjectName"><?= $this->getText('Name'); ?></label>
@@ -202,7 +202,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('RiskObjectStatus'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iRiskObjectNameValue"><?= $this->getText('RiskObject'); ?></label>
@@ -247,7 +247,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('Solution'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iSolutionName"><?= $this->getText('Name'); ?></label>
diff --git a/Theme/backend/cockpit.tpl.php b/Theme/backend/cockpit.tpl.php
index a0d221b..a0b0fdd 100644
--- a/Theme/backend/cockpit.tpl.php
+++ b/Theme/backend/cockpit.tpl.php
@@ -44,7 +44,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="6"><?= $footerView->render(); ?>
                 <tbody>
                 <?php $c = 0; foreach ([] as $key => $value) : $c++;
-                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}id=' . $value->getId()); ?>
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
                 <tr>
                     <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
diff --git a/Theme/backend/risk-create.tpl.php b/Theme/backend/risk-create.tpl.php
index 2a85546..fb1e258 100644
--- a/Theme/backend/risk-create.tpl.php
+++ b/Theme/backend/risk-create.tpl.php
@@ -34,7 +34,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('Risk'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iName"><?= $this->getText('Name'); ?></label>
@@ -106,7 +106,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('RiskStatus'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iRiskConsequence"><?= $this->getText('RiskConsequence'); ?></label>
@@ -161,7 +161,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('RiskObjects'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iRiskObjectName"><?= $this->getText('Name'); ?></label>
@@ -202,7 +202,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('RiskObjectStatus'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iRiskObjectNameValue"><?= $this->getText('RiskObject'); ?></label>
@@ -247,7 +247,7 @@ echo $this->getData('nav')->render(); ?>
                         <header><h1><?= $this->getText('Solution'); ?></h1></header>
 
                         <div class="inner">
-                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}csrf={$CSRF}'); ?>">
+                            <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iSolutionName"><?= $this->getText('Name'); ?></label>