diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 92dfb09..9273b7d 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -30,7 +30,6 @@ use phpOMS\Asset\AssetType;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\Query\OrderType;
-use phpOMS\DataStorage\Database\Query\Where;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Utils\StringUtils;
@@ -334,9 +333,7 @@ final class BackendController extends Controller
                 'segment', 'section', 'sales_group', 'product_group', 'product_type',
                 'sales_tax_code', 'purchase_tax_code',
             ], 'IN')
-            ->where('defaults/l11n', (new Where($this->app->dbPool->get()))
-                ->where(ClientAttributeValueL11nMapper::getColumnByMember('ref') ?? '', '=', null)
-                ->orWhere(ClientAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language))
+            ->where('defaults/l11n/language', [$response->header->l11n->language, null])
             ->executeGetArray();
 
         $defaultAttributeTypes = [];
@@ -354,9 +351,7 @@ final class BackendController extends Controller
                 'segment', 'section', 'client_group', 'client_type',
                 'sales_tax_code',
             ], 'IN')
-            ->where('defaults/l11n', (new Where($this->app->dbPool->get()))
-                ->where(ClientAttributeValueL11nMapper::getColumnByMember('ref') ?? '', '=', null)
-                ->orWhere(ClientAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language))
+            ->where('defaults/l11n/language', [$response->header->l11n->language, null])
             ->executeGetArray();
 
         $clientSegmentationTypes = [];
@@ -402,23 +397,6 @@ final class BackendController extends Controller
         return $view;
     }
 
-    /**
-     * Routing end-point for application behavior.
-     *
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param array            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since 1.0.0
-     * @codeCoverageIgnore
-     */
-    public function viewClientManagementClientAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
-    {
-        return new View($this->app->l11nManager, $request, $response);
-    }
-
     /**
      * Routing end-point for application behavior.
      *
diff --git a/Theme/Backend/client-view.tpl.php b/Theme/Backend/client-view.tpl.php
index 4d594b5..e33de14 100644
--- a/Theme/Backend/client-view.tpl.php
+++ b/Theme/Backend/client-view.tpl.php
@@ -241,7 +241,7 @@ echo $this->data['nav']->render();
 
                     <section class="portlet hl-4">
                         <div class="portlet-body">
-                            <textarea class="undecorated"><?= $this->printHtml($client->info); ?></textarea>
+                            <textarea class="undecorated"><?= $this->printTextarea($client->info); ?></textarea>
                         </div>
                     </section>
                     <?php endif; ?>
@@ -1291,7 +1291,7 @@ echo $this->data['nav']->render();
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
-                    <div class="portlet">
+                    <section class="portlet">
                         <div class="portlet-head"><?= $this->getHtml('Logs', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                         <table class="default sticky">
@@ -1344,7 +1344,7 @@ echo $this->data['nav']->render();
                             <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
                         </div>
                         -->
-                    </div>
+                    </section>
                 </div>
             </div>
         </div>