diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 26dd0d4..8046989 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -95,7 +95,7 @@ final class ApiController extends Controller
         $code                    = new TaxCode();
         $code->abbr              = $request->getDataString('abbr') ?? '';
         $code->percentageInvoice = $request->getDataInt('percentage_invoice') ?? 0;
-        $code->percentageOutput   = $request->getDataInt('percentage_sales_tax') ?? 0;
+        $code->percentageOutput  = $request->getDataInt('percentage_sales_tax') ?? 0;
         $code->percentageInput   = $request->getDataInt('percentage_input_tax') ?? 0;
         $code->taxAccount1       = $request->getDataString('tax1');
         $code->taxAccount2       = $request->getDataString('tax2');
@@ -225,7 +225,7 @@ final class ApiController extends Controller
     {
         $new->abbr              = $request->getDataString('abbr') ?? $new->abbr;
         $new->percentageInvoice = $request->getDataInt('percentage_invoice') ?? $new->percentageInvoice;
-        $new->percentageOutput   = $request->getDataInt('percentage_sales_tax') ?? $new->percentageOutput;
+        $new->percentageOutput  = $request->getDataInt('percentage_sales_tax') ?? $new->percentageOutput;
         $new->percentageInput   = $request->getDataInt('percentage_input_tax') ?? $new->percentageInput;
 
         return $new;
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index a5ba231..d196335 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\Finance\Controller;
 
 use Modules\Finance\Models\TaxCodeMapper;
-use phpOMS\Asset\AssetType;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 030ee61..56c8f7b 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -103,9 +103,9 @@ return ['Finance' => [
     'Turnover'             => 'Umsatz',
     'Type'                 => 'Typ',
     'ZipCode'              => 'Postleitzahl',
-    'TaxCodes'              => 'Steuerkz.',
+    'TaxCodes'             => 'Steuerkz.',
     'TaxCode'              => 'Steuerkz.',
-    'Purchase'              => 'Einkauf',
-    'Tax1Account'              => 'Steuerkonto 1',
-    'Tax2Account'              => 'Steyerkonto 2',
+    'Purchase'             => 'Einkauf',
+    'Tax1Account'          => 'Steuerkonto 1',
+    'Tax2Account'          => 'Steyerkonto 2',
 ]];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 574ac63..bb2cf6e 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -103,9 +103,9 @@ return ['Finance' => [
     'Turnover'             => 'Turnover',
     'Type'                 => 'Type',
     'ZipCode'              => 'Zip Code',
-    'TaxCodes'              => 'Tax Codes',
+    'TaxCodes'             => 'Tax Codes',
     'TaxCode'              => 'Tax Code',
-    'Purchase'              => 'Purchase',
-    'Tax1Account'              => 'Tax Account 1',
-    'Tax2Account'              => 'Tax Account 2',
+    'Purchase'             => 'Purchase',
+    'Tax1Account'          => 'Tax Account 1',
+    'Tax2Account'          => 'Tax Account 2',
 ]];
diff --git a/Theme/Backend/finance-taxcode-list.tpl.php b/Theme/Backend/finance-taxcode-list.tpl.php
index 37441ce..dd59caf 100644
--- a/Theme/Backend/finance-taxcode-list.tpl.php
+++ b/Theme/Backend/finance-taxcode-list.tpl.php
@@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
  */
 $taxcode = $this->data['taxcode'];
 
-$previous = empty($taxcode) ? '{/base}/finance/tax/code/list' : '{/base}/finance/tax/code/list?{?}&id=' . \reset($taxcode)->id . '&ptype=p';
-$next     = empty($taxcode) ? '{/base}/finance/tax/code/list' : '{/base}/finance/tax/code/list?{?}&id=' . \end($taxcode)->id . '&ptype=n';
+$previous = empty($taxcode) ? '{/base}/finance/tax/code/list' : '{/base}/finance/tax/code/list?{?}&offset=' . \reset($taxcode)->id . '&ptype=p';
+$next     = empty($taxcode) ? '{/base}/finance/tax/code/list' : '{/base}/finance/tax/code/list?{?}&offset=' . \end($taxcode)->id . '&ptype=n';
 
 echo $this->data['nav']->render(); ?>
 <div class="row">