diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php
index 7fde06e06..73c8bd463 100755
--- a/DataStorage/Database/Mapper/ReadMapper.php
+++ b/DataStorage/Database/Mapper/ReadMapper.php
@@ -381,16 +381,6 @@ final class ReadMapper extends DataMapperAbstract
         $query ??= $this->getQuery();
 
         try {
-            /*
-            \phpOMS\Log\FileLogger::getInstance()->info(
-                \phpOMS\Log\FileLogger::MSG_FULL, [
-                    'message' => $query->toSql(),
-                    'line'    => __LINE__,
-                    'file'    => self::class,
-                ]
-            );
-            */
-
             $sth = $this->db->con->prepare($query->toSql());
             if ($sth === false) {
                 yield [];
diff --git a/DataStorage/Session/HttpSession.php b/DataStorage/Session/HttpSession.php
index 4e595732e..ee652b6f4 100755
--- a/DataStorage/Session/HttpSession.php
+++ b/DataStorage/Session/HttpSession.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 
 namespace phpOMS\DataStorage\Session;
 
-use phpOMS\Log\FileLogger;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Session\JWT;
 use phpOMS\Uri\UriFactory;
@@ -106,8 +105,8 @@ final class HttpSession implements SessionInterface
             \session_start();
             // @codeCoverageIgnoreEnd
         } else {
-            FileLogger::getInstance()->warning(
-                FileLogger::MSG_FULL, [
+            \phpOMS\Log\FileLogger::getInstance()->warning(
+                \phpOMS\Log\FileLogger::MSG_FULL, [
                     'message' => 'Headers already sent.',
                     'line'    => __LINE__,
                     'file'    => self::class,
diff --git a/Localization/L11nManager.php b/Localization/L11nManager.php
index 40e546fdf..25e9d2261 100755
--- a/Localization/L11nManager.php
+++ b/Localization/L11nManager.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace phpOMS\Localization;
 
 use phpOMS\Autoloader;
-use phpOMS\Log\FileLogger;
 use phpOMS\Module\ModuleAbstract;
 use phpOMS\Stdlib\Base\FloatInt;
 
@@ -176,7 +175,7 @@ final class L11nManager
             $this->loadLanguage($code, $module, $class::getLocalization($code, $theme));
         } catch (\Throwable $_) {
             // @codeCoverageIgnoreStart
-            FileLogger::getInstance()->warning(FileLogger::MSG_FULL, [
+            \phpOMS\Log\FileLogger::getInstance()->warning(\phpOMS\Log\FileLogger::MSG_FULL, [
                 'message' => 'Undefined translation for \'' . $code . '/' . $module . '/' . $translation . '\'.',
             ]);
             // @codeCoverageIgnoreEnd
diff --git a/Message/Cli/CliResponse.php b/Message/Cli/CliResponse.php
index c216d8086..3d2c90082 100755
--- a/Message/Cli/CliResponse.php
+++ b/Message/Cli/CliResponse.php
@@ -16,7 +16,6 @@ namespace phpOMS\Message\Cli;
 
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Localization\Localization;
-use phpOMS\Log\FileLogger;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\System\MimeType;
@@ -158,9 +157,9 @@ final class CliResponse extends ResponseAbstract implements RenderableInterface
             } elseif ($response === null) {
                 continue;
             } else {
-                FileLogger::getInstance()
+                \phpOMS\Log\FileLogger::getInstance()
                     ->error(
-                        FileLogger::MSG_FULL, [
+                        \phpOMS\Log\FileLogger::MSG_FULL, [
                             'message' => 'Unknown type.',
                             'line'    => __LINE__,
                             'file'    => self::class,
diff --git a/Message/Http/HttpResponse.php b/Message/Http/HttpResponse.php
index 5aed4630e..2213b63b9 100755
--- a/Message/Http/HttpResponse.php
+++ b/Message/Http/HttpResponse.php
@@ -16,7 +16,6 @@ namespace phpOMS\Message\Http;
 
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Localization\Localization;
-use phpOMS\Log\FileLogger;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\System\MimeType;
 use phpOMS\Utils\ArrayUtils;
@@ -190,9 +189,9 @@ final class HttpResponse extends ResponseAbstract implements RenderableInterface
             } elseif ($response === null) {
                 continue;
             } else {
-                FileLogger::getInstance()
+                \phpOMS\Log\FileLogger::getInstance()
                     ->error(
-                        FileLogger::MSG_FULL, [
+                        \phpOMS\Log\FileLogger::MSG_FULL, [
                             'message' => 'Unknown type.',
                             'line'    => __LINE__,
                             'file'    => self::class,
diff --git a/Module/NullModule.php b/Module/NullModule.php
index e8880fa05..506a521d1 100755
--- a/Module/NullModule.php
+++ b/Module/NullModule.php
@@ -14,8 +14,6 @@ declare(strict_types=1);
 
 namespace phpOMS\Module;
 
-use phpOMS\Log\FileLogger;
-
 /**
  * Mull module class.
  *
@@ -35,9 +33,9 @@ final class NullModule extends ModuleAbstract
     /** {@inheritdoc} */
     public static function __callStatic(string $name, array $arguments) : void
     {
-        FileLogger::getInstance()
+        \phpOMS\Log\FileLogger::getInstance()
             ->error(
-                FileLogger::MSG_FULL, [
+                \phpOMS\Log\FileLogger::MSG_FULL, [
                     'message' => 'Expected module/controller but got NullModule.',
                     'line'    => __LINE__,
                     'file'    => self::class,
diff --git a/Utils/Parser/Markdown/Markdown.php b/Utils/Parser/Markdown/Markdown.php
index c1b191fa0..442803ebf 100755
--- a/Utils/Parser/Markdown/Markdown.php
+++ b/Utils/Parser/Markdown/Markdown.php
@@ -729,7 +729,7 @@ class Markdown
             return null;
         }
 
-        $url = UriFactory::build($matches[1]);
+        $url = UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[1]));
 
         if (!isset($matches[2])) {
             $url = "mailto:{$url}";
@@ -943,7 +943,7 @@ class Markdown
             return null;
         }
 
-        $url = UriFactory::build($matches[0][0]);
+        $url = UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[0][0]));
 
         return [
             'extent'   => \strlen($matches[0][0]),
@@ -976,7 +976,7 @@ class Markdown
             return null;
         }
 
-        $url = UriFactory::build($matches[1]);
+        $url = UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[1]));
 
         return [
             'extent'  => \strlen($matches[0]),
@@ -1390,7 +1390,7 @@ class Markdown
                 default:
                     $element    = 'video';
                     $attributes = [
-                        'src'      => UriFactory::build($url),
+                        'src'      => UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $url)),
                         'controls' => '',
                     ];
             }
@@ -1410,7 +1410,7 @@ class Markdown
                     'name'       => 'audio',
                     'text'       => $matches[1],
                     'attributes' => [
-                        'src'      => UriFactory::build($url),
+                        'src'      => UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $url)),
                         'controls' => '',
                     ],
                 ],
@@ -2310,7 +2310,7 @@ class Markdown
         $id = \strtolower($matches[1]);
 
         $this->definitionData['Reference'][$id] = [
-            'url'   => UriFactory::build($matches[2]),
+            'url'   => UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[2])),
             'title' => isset($matches[3]) ? $matches[3] : null,
         ];
 
@@ -4394,7 +4394,7 @@ class Markdown
         }
 
         if (\preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*+"|\'[^\']*+\'))?\s*+[)]/', $remainder, $matches)) {
-            $element['attributes']['href'] = UriFactory::build($matches[1]);
+            $element['attributes']['href'] = UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[1]));
 
             if (isset($matches[2])) {
                 $element['attributes']['title'] = \substr($matches[2], 1, - 1);