diff --git a/Admin/Install/Search.php b/Admin/Install/Search.php
new file mode 100644
index 0000000..b45bb7d
--- /dev/null
+++ b/Admin/Install/Search.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   Modules\Knowledgebase\Admin\Install
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
+declare(strict_types=1);
+
+namespace Modules\Knowledgebase\Admin\Install;
+
+use phpOMS\Application\ApplicationAbstract;
+
+/**
+ * Search class.
+ *
+ * @package Modules\Knowledgebase\Admin\Install
+ * @license OMS License 2.0
+ * @link    https://jingga.app
+ * @since   1.0.0
+ */
+final class Search
+{
+    /**
+     * Install navigation providing
+     *
+     * @param ApplicationAbstract $app  Application
+     * @param string              $path Module path
+     *
+     * @return void
+     *
+     * @since 1.0.0
+     */
+    public static function install(ApplicationAbstract $app, string $path) : void
+    {
+        \Modules\Search\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/SearchCommands.php']);
+    }
+}
diff --git a/Admin/Install/SearchCommands.php b/Admin/Install/SearchCommands.php
new file mode 100644
index 0000000..b3038d8
--- /dev/null
+++ b/Admin/Install/SearchCommands.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   Modules\Knowledgebase
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
+declare(strict_types=1);
+
+use Modules\Knowledgebase\Controller\SearchController;
+use Modules\Knowledgebase\Models\PermissionCategory;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
+
+return [
+    '^(?!:).+.*?' => [
+        [
+            'dest'       => '\Modules\Knowledgebase\Controller\SearchController:searchGeneral',
+            'verb'       => RouteVerb::ANY,
+            'permission' => [
+                'module' => SearchController::NAME,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionCategory::WIKI,
+            ],
+        ],
+    ],
+];
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index cc06dea..28ca5ee 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -106,8 +106,10 @@ final class ApiController extends Controller
         /** @var \Modules\Admin\Models\Account $account */
         $account = AccountMapper::get()->where('id', $request->header->account)->execute();
 
+        $collection = null;
+
         if (!empty($uploadedFiles = $request->files)) {
-            $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
+            $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
                 names: [],
                 fileNames: [],
                 files: $uploadedFiles,
@@ -116,7 +118,6 @@ final class ApiController extends Controller
                 virtualPath: $path,
             );
 
-            $collection = null;
             foreach ($uploaded as $media) {
                 $this->createModelRelation(
                     $request->header->account,
@@ -140,13 +141,11 @@ final class ApiController extends Controller
 
                 $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
 
-                if ($collection === null) {
-                    $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
-                        $accountPath,
-                        $request->header->account,
-                        __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id . '/Knowledgebase/' . ($doc->category?->id ?? '0') . '/' . $doc->id
-                    );
-                }
+                $collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
+                    $accountPath,
+                    $request->header->account,
+                    __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id . '/Knowledgebase/' . ($doc->category?->id ?? '0') . '/' . $doc->id
+                );
 
                 $this->createModelRelation(
                     $request->header->account,
@@ -160,48 +159,43 @@ final class ApiController extends Controller
             }
         }
 
-        if (!empty($mediaFiles = $request->getDataJson('media'))) {
-            $collection = null;
+        $mediaFiles = $request->getDataJson('media');
+        foreach ($mediaFiles as $file) {
+            /** @var \Modules\Media\Models\Media $media */
+            $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
+            $this->createModelRelation(
+                $request->header->account,
+                $doc->id,
+                $media->id,
+                WikiDocMapper::class,
+                'files',
+                '',
+                $request->getOrigin()
+            );
 
-            foreach ($mediaFiles as $file) {
-                /** @var \Modules\Media\Models\Media $media */
-                $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
-                $this->createModelRelation(
-                    $request->header->account,
-                    $doc->id,
-                    $media->id,
-                    WikiDocMapper::class,
-                    'files',
-                    '',
-                    $request->getOrigin()
-                );
+            $ref            = new Reference();
+            $ref->name      = $media->name;
+            $ref->source    = new NullMedia($media->id);
+            $ref->createdBy = new NullAccount($request->header->account);
+            $ref->setVirtualPath($path);
 
-                $ref            = new Reference();
-                $ref->name      = $media->name;
-                $ref->source    = new NullMedia($media->id);
-                $ref->createdBy = new NullAccount($request->header->account);
-                $ref->setVirtualPath($path);
+            $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
 
-                $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
+            $collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
+                $path,
+                $request->header->account,
+                __DIR__ . '/../../../Modules/Media/Files' . $path
+            );
 
-                if ($collection === null) {
-                    $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
-                        $path,
-                        $request->header->account,
-                        __DIR__ . '/../../../Modules/Media/Files' . $path
-                    );
-                }
-
-                $this->createModelRelation(
-                    $request->header->account,
-                    $collection->id,
-                    $ref->id,
-                    CollectionMapper::class,
-                    'sources',
-                    '',
-                    $request->getOrigin()
-                );
-            }
+            $this->createModelRelation(
+                $request->header->account,
+                $collection->id,
+                $ref->id,
+                CollectionMapper::class,
+                'sources',
+                '',
+                $request->getOrigin()
+            );
         }
     }
 
@@ -864,8 +858,6 @@ final class ApiController extends Controller
      *
      * @return array<string, bool>
      *
-     * @todo Implement API validation function
-     *
      * @since 1.0.0
      */
     private function validateCategoryL11nDelete(RequestAbstract $request) : array
diff --git a/Controller/SearchController.php b/Controller/SearchController.php
new file mode 100644
index 0000000..85f8584
--- /dev/null
+++ b/Controller/SearchController.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   Modules\Knowledgebase
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
+declare(strict_types=1);
+
+namespace Modules\Knowledgebase\Controller;
+
+use Modules\Knowledgebase\Models\WikiDocMapper;
+use phpOMS\DataStorage\Database\Query\OrderType;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+use phpOMS\System\MimeType;
+
+/**
+ * Search class.
+ *
+ * @package Modules\Knowledgebase
+ * @license OMS License 2.0
+ * @link    https://jingga.app
+ * @since   1.0.0
+ */
+final class SearchController extends Controller
+{
+    /**
+     * Api method to search for tags
+     *
+     * @param RequestAbstract  $request  Request
+     * @param ResponseAbstract $response Response
+     * @param array            $data     Generic data
+     *
+     * @return void
+     *
+     * @api
+     *
+     * @since 1.0.0
+     */
+    public function searchGeneral(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
+    {
+        /** @var \Modules\Knowledgebase\Models\WikiDoc[] $docs */
+        $docs = WikiDocMapper::getAll()
+            ->with('tags')
+            ->with('tags/title')
+            ->where('name', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE')
+            ->where('docRaw', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE', 'OR')
+            ->where('language', $request->header->l11n->language)
+            ->where('tags/title/language', $response->header->l11n->language)
+            ->sort('createdAt', OrderType::DESC)
+            ->limit(8)
+            ->execute();
+
+        $results = [];
+        foreach ($docs as $doc) {
+            $results[] = [
+                'title'     => $doc->name,
+                'summary'   => '',
+                'link'      => '{/base}/wiki/doc/view?id=' . $doc->id,
+                'account'   => '',
+                'createdAt' => $doc->createdAt,
+                'image' => '',
+                'tags'  => $doc->tags,
+                'type'  => 'list_links',
+                'module'  => 'Knowledgebase',
+            ];
+        }
+
+        $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
+        $response->add($request->uri->__toString(), $results);
+    }
+}
diff --git a/Models/Elastic/WikiDoc.json b/Models/Elastic/WikiDoc.json
new file mode 100644
index 0000000..3aa7e63
--- /dev/null
+++ b/Models/Elastic/WikiDoc.json
@@ -0,0 +1,7 @@
+{
+    "id": "{id}",
+    "title": "{title}",
+    "content": "{content}",
+    "language": "{language}",
+    "tags": ["{tags}"]
+}
\ No newline at end of file
diff --git a/info.json b/info.json
index 80511ac..ce91204 100755
--- a/info.json
+++ b/info.json
@@ -24,7 +24,8 @@
     },
     "providing": {
         "Navigation": "*",
-        "Media": "*"
+        "Media": "*",
+        "Search": "*"
     },
     "load": [
         {