diff --git a/frontend/pages/backend/[backend]/mismatched.vue b/frontend/pages/backend/[backend]/mismatched.vue
index c4841775..cd09c5ac 100644
--- a/frontend/pages/backend/[backend]/mismatched.vue
+++ b/frontend/pages/backend/[backend]/mismatched.vue
@@ -34,7 +34,7 @@
             <div class="content">
               <ul>
                 <li>
-                  Check the items will take time, you will see the spinner while <code>WatchState</code> is analyzing
+                  Checking the items will take time, you will see the spinner while <code>WatchState</code> is analyzing
                   the entire backend libraries content. Do not reload the page.
                 </li>
               </ul>
@@ -94,23 +94,23 @@
             <div class="card-content">
               <div class="columns is-mobile is-multiline">
                 <div class="column is-6">
-                  <strong>Library:</strong> {{ item.library }}
+                  <strong class="is-unselectable">Library:</strong> {{ item.library }}
                 </div>
                 <div class="column is-6 has-text-right">
-                  <strong>Type:</strong> {{ item.type }}
+                  <strong class="is-unselectable">Type:</strong> {{ item.type }}
                 </div>
                 <div class="column is-6">
-                  <strong>Year:</strong> {{ item.year ?? '???' }}
+                  <strong class="is-unselectable">Year:</strong> {{ item.year ?? '???' }}
                 </div>
                 <div class="column is-6 has-text-right">
-                  <strong>Percent:</strong> <span :class="percentColor(item.percent)">
+                  <strong class="is-unselectable">Percent:</strong> <span :class="percentColor(item.percent)">
                   {{ item.percent.toFixed(2) }}%
                 </span>
                 </div>
-                <div class="column is-12" v-if="item.path">
+                <div class="column is-12" v-if="item.path"
+                     @click="(e) => e.target.firstChild?.classList?.toggle('is-text-overflow')">
                   <div class="is-text-overflow">
-                    <span class="icon"><i class="fas fa-file"></i></span>
-                    <span class="is-hidden-mobile">File:&nbsp;</span>
+                    <strong class="is-unselectable">Path:&nbsp;</strong>
                     <NuxtLink :to="makeSearchLink('path',item.path)" v-text="item.path"/>
                   </div>
                 </div>
diff --git a/frontend/pages/backend/[backend]/unmatched.vue b/frontend/pages/backend/[backend]/unmatched.vue
index a57754a5..151d74d6 100644
--- a/frontend/pages/backend/[backend]/unmatched.vue
+++ b/frontend/pages/backend/[backend]/unmatched.vue
@@ -34,7 +34,7 @@
             <div class="content">
               <ul>
                 <li>
-                  Check the items will take time, you will see the spinner while <code>WatchState</code> is analyzing
+                  Checking the items will take time, you will see the spinner while <code>WatchState</code> is analyzing
                   the entire backend libraries content. Do not reload the page.
                 </li>
               </ul>
@@ -92,13 +92,22 @@
             <div class="card-content">
               <div class="columns is-mobile is-multiline">
                 <div class="column is-6">
-                  <strong>Library:</strong> {{ item.library }}
+                  <strong class="is-unselectable">Library:</strong> {{ item.library ?? 'Unknown' }}
                 </div>
                 <div class="column is-6 has-text-right">
-                  <strong>Type:</strong> {{ item.type }}
+                  <strong class="is-unselectable">Type:</strong> <span class="is-capitalized">{{
+                    item.type ?? 'Unknown'
+                  }}</span>
                 </div>
                 <div class="column is-6" v-if="0 !== item.year && item.year">
-                  <strong>Year:</strong> {{ item.year }}
+                  <strong class="is-unselectable">Year:</strong> {{ item.year ?? 'Unknown' }}
+                </div>
+                <div class="column is-12 is-clickable has-text-left" v-if="item?.path"
+                     @click="(e) => e.target.firstChild?.classList?.toggle('is-text-overflow')">
+                  <div class="is-text-overflow">
+                    <strong class="is-unselectable">Path:&nbsp;</strong>
+                    <NuxtLink :to="makeSearchLink('path',item.path)" v-text="item.path"/>
+                  </div>
                 </div>
               </div>
             </div>
@@ -134,7 +143,7 @@
 </template>
 
 <script setup>
-import {notification} from "~/utils/index.js";
+import {makeSearchLink, notification} from "~/utils/index.js";
 
 const backend = useRoute().params.backend
 const items = ref([])
diff --git a/src/API/Backend/Unmatched.php b/src/API/Backend/Unmatched.php
index f9294955..a93f48a7 100644
--- a/src/API/Backend/Unmatched.php
+++ b/src/API/Backend/Unmatched.php
@@ -7,12 +7,14 @@ namespace App\API\Backend;
 use App\API\Backend\Index as backendIndex;
 use App\Libs\Attributes\Route\Get;
 use App\Libs\DataUtil;
+use App\Libs\Entity\StateInterface as iState;
 use App\Libs\Exceptions\RuntimeException;
 use App\Libs\HTTP_STATUS;
 use App\Libs\Options;
 use App\Libs\Traits\APITraits;
 use Psr\Http\Message\ResponseInterface as iResponse;
 use Psr\Http\Message\ServerRequestInterface as iRequest;
+use Throwable;
 
 final class Unmatched
 {
@@ -33,9 +35,9 @@ final class Unmatched
             $backendOpts = ag_set($backendOpts, 'client.timeout', (float)$params->get('timeout'));
         }
 
-        if ($params->get('raw')) {
-            $opts[Options::RAW_RESPONSE] = true;
-        }
+        $includeRaw = $params->get('raw') || $params->get(Options::RAW_RESPONSE);
+
+        $opts[Options::RAW_RESPONSE] = true;
 
         try {
             $client = $this->getClient(name: $name, config: $backendOpts);
@@ -55,11 +57,39 @@ final class Unmatched
             }
         }
 
+        $opts[Options::RAW_RESPONSE] = true;
+
         foreach ($ids as $libraryId) {
+            $opts[iState::COLUMN_META_LIBRARY] = $libraryId;
             foreach ($client->getLibrary(id: $libraryId, opts: $opts) as $item) {
-                if (null === ($externals = ag($item, 'guids', null)) || empty($externals)) {
-                    $list[] = $item;
+                $entity = $client->toEntity($item[Options::RAW_RESPONSE], $opts);
+
+                if ($entity->hasGuids() || $entity->hasParentGuid()) {
+                    continue;
                 }
+
+                $builder = $entity->getAll();
+
+                try {
+                    $builder['webUrl'] = (string)$client->getWebUrl(
+                        $entity->type,
+                        ag($entity->getMetadata($entity->via), iState::COLUMN_ID)
+                    );
+                } catch (Throwable) {
+                    $builder['webUrl'] = null;
+                }
+
+                $builder[iState::COLUMN_META_LIBRARY] = ag($item, iState::COLUMN_META_LIBRARY);
+
+                if ($includeRaw) {
+                    $builder[Options::RAW_RESPONSE] = ag($item, Options::RAW_RESPONSE, []);
+                }
+
+                if (null !== ($path = ag($entity->getMetadata($entity->via), 'path'))) {
+                    $builder[iState::COLUMN_META_PATH] = $path;
+                }
+
+                $list[] = $builder;
             }
         }
 
diff --git a/src/Backends/Jellyfin/JellyfinActionTrait.php b/src/Backends/Jellyfin/JellyfinActionTrait.php
index 44617bf8..7756c463 100644
--- a/src/Backends/Jellyfin/JellyfinActionTrait.php
+++ b/src/Backends/Jellyfin/JellyfinActionTrait.php
@@ -54,7 +54,8 @@ trait JellyfinActionTrait
             }
         }
 
-        $type = JellyfinClient::TYPE_MAPPER[ag($item, 'Type')] ?? ag($item, 'Type');
+        $type = ag($item, 'Type', '');
+        $type = JellyfinClient::TYPE_MAPPER[$type] ?? $type;
 
         if (null === $date) {
             if (iState::TYPE_SHOW !== $type) {
@@ -124,7 +125,7 @@ trait JellyfinActionTrait
         $metadataExtra = &$metadata[iState::COLUMN_META_DATA_EXTRA];
 
         // -- jellyfin/emby API does not provide library ID.
-        if (null !== ($library = $opts['library'] ?? null)) {
+        if (null !== ($library = $opts[iState::COLUMN_META_LIBRARY] ?? null)) {
             $metadata[iState::COLUMN_META_LIBRARY] = (string)$library;
         }
 
@@ -172,9 +173,8 @@ trait JellyfinActionTrait
         }
 
         if (false === $isPlayed && null !== ($progress = ag($item, 'UserData.PlaybackPositionTicks', null))) {
-            $metadata[iState::COLUMN_META_DATA_PROGRESS] = (string)floor(
-                $progress / 1_00_00
-            ); // -- Convert to milliseconds.
+            // -- Convert to play progress to milliseconds.
+            $metadata[iState::COLUMN_META_DATA_PROGRESS] = (string)floor($progress / 1_00_00);
         }
 
         unset($metadata, $metadataExtra);
diff --git a/src/Backends/Plex/PlexActionTrait.php b/src/Backends/Plex/PlexActionTrait.php
index 20f0689d..f7e62146 100644
--- a/src/Backends/Plex/PlexActionTrait.php
+++ b/src/Backends/Plex/PlexActionTrait.php
@@ -55,9 +55,12 @@ trait PlexActionTrait
             $date = max(ag($item, 'lastViewedAt', 0), ag($item, 'addedAt', 0), ag($item, 'updatedAt', 0));
         }
 
+        $type = (string)ag($item, 'type', '');
+        $type = $this->typeMapper[$type] ?? $this->typeMapper[strtolower($type)] ?? $type;
+
         if (null === $date) {
-            if (PlexClient::TYPE_SHOW !== ag($item, 'type', '')) {
-                throw new InvalidArgumentException('No date was set on object.');
+            if (iState::TYPE_SHOW !== $type) {
+                throw new InvalidArgumentException('No date was set on object');
             }
             $date = 0;
         }
@@ -73,27 +76,25 @@ trait PlexActionTrait
             $item['Guid'][] = ['id' => ag($item, 'guid')];
         }
 
-        $type = $this->typeMapper[ag($item, 'type')] ?? ag($item, 'type');
-
         $logContext = [
             'backend' => $context->backendName,
             'item' => [
                 'id' => ag($item, 'ratingKey'),
                 'type' => ag($item, 'type'),
-                'title' => match (ag($item, 'type')) {
-                    PlexClient::TYPE_MOVIE, PlexClient::TYPE_SHOW => sprintf(
+                'title' => match ($type) {
+                    iState::TYPE_MOVIE, iState::TYPE_SHOW => sprintf(
                         '%s (%s)',
                         ag($item, ['title', 'originalTitle'], '??'),
                         0 === $year ? '0000' : $year,
                     ),
-                    PlexClient::TYPE_EPISODE => sprintf(
+                    iState::TYPE_EPISODE => sprintf(
                         '%s - (%sx%s)',
                         ag($item, ['grandparentTitle', 'originalTitle', 'title'], '??'),
                         str_pad((string)ag($item, 'parentIndex', 0), 2, '0', STR_PAD_LEFT),
                         str_pad((string)ag($item, 'index', 0), 3, '0', STR_PAD_LEFT),
                     ),
                     default => throw new InvalidArgumentException(
-                        r('Unexpected Content type [{type}] was received.', [
+                        r("Unexpected Content type '{type}' was received.", [
                             'type' => $type
                         ])
                     ),
@@ -134,7 +135,7 @@ trait PlexActionTrait
         $metadata = &$builder[iState::COLUMN_META_DATA][$context->backendName];
         $metadataExtra = &$metadata[iState::COLUMN_META_DATA_EXTRA];
 
-        if (null !== ($library = ag($item, 'librarySectionID', $opts['library'] ?? null))) {
+        if (null !== ($library = ag($item, 'librarySectionID', $opts[iState::COLUMN_META_LIBRARY] ?? null))) {
             $metadata[iState::COLUMN_META_LIBRARY] = (string)$library;
         }
 
diff --git a/src/Commands/Backend/Library/MismatchCommand.php b/src/Commands/Backend/Library/MismatchCommand.php
index d18b3c90..a776e24f 100644
--- a/src/Commands/Backend/Library/MismatchCommand.php
+++ b/src/Commands/Backend/Library/MismatchCommand.php
@@ -96,10 +96,6 @@ final class MismatchCommand extends Command
 
                     {cmd} <cmd>{route}</cmd> <flag>--id</flag> <value>backend_library_id</value> <flag>-s</flag> <value>backend_name</value>
 
-                    <question># I want to show all items regardless of the status?</question>
-
-                    {cmd} <cmd>{route}</cmd> <flag>--show-all</flag> <flag>-s</flag> <value>backend_name</value>
-
                     HELP,
                     [
                         'cmd' => trim(commandContext()),
@@ -200,7 +196,12 @@ final class MismatchCommand extends Command
                     $title = mb_substr($title, 0, $cutoff) . '..';
                 }
 
-                $leaf[iState::COLUMN_TITLE] = $title;
+                if (null !== ($webUrl = ag($item, 'webUrl'))) {
+                    $leaf[iState::COLUMN_TITLE] = "<href={$webUrl}>{$title}</>";
+                } else {
+                    $leaf[iState::COLUMN_TITLE] = $title;
+                }
+
                 $leaf[iState::COLUMN_YEAR] = ag($item, iState::COLUMN_YEAR);
                 $leaf['percent'] = ag($item, 'percent') . '%';
 
diff --git a/src/Commands/Backend/Library/UnmatchedCommand.php b/src/Commands/Backend/Library/UnmatchedCommand.php
index 5e6bfb86..4c735ef1 100644
--- a/src/Commands/Backend/Library/UnmatchedCommand.php
+++ b/src/Commands/Backend/Library/UnmatchedCommand.php
@@ -7,8 +7,9 @@ namespace App\Commands\Backend\Library;
 use App\Command;
 use App\Libs\Attributes\Route\Cli;
 use App\Libs\Config;
+use App\Libs\Entity\StateInterface as iState;
+use App\Libs\HTTP_STATUS;
 use App\Libs\Options;
-use RuntimeException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -32,7 +33,6 @@ final class UnmatchedCommand extends Command
     {
         $this->setName(self::ROUTE)
             ->setDescription('Find Item in backend library that does not have external ids.')
-            ->addOption('show-all', null, InputOption::VALUE_NONE, 'Show all items regardless of the match status.')
             ->addOption(
                 'timeout',
                 null,
@@ -61,10 +61,6 @@ final class UnmatchedCommand extends Command
 
                     {cmd} <cmd>{route}</cmd> <flag>--id</flag> <value>backend_library_id</value> <flag>-s</flag> <value>backend_name</value>
 
-                    <question># I want to show all items regardless of the status?</question>
-
-                    {cmd} <cmd>{route}</cmd> <flag>--show-all</flag> <flag>-s</flag> <value>backend_name</value>
-
                     HELP,
                     [
                         'cmd' => trim(commandContext()),
@@ -86,7 +82,6 @@ final class UnmatchedCommand extends Command
     protected function runCommand(InputInterface $input, OutputInterface $output): int
     {
         $mode = $input->getOption('output');
-        $showAll = $input->getOption('show-all');
         $id = $input->getOption('id');
         $cutoff = (int)$input->getOption('cutoff');
         $name = $input->getOption('select-backend');
@@ -96,71 +91,56 @@ final class UnmatchedCommand extends Command
             return self::FAILURE;
         }
 
-        $backendOpts = $opts = $list = [];
+        $query = [];
 
         if ($input->getOption('timeout')) {
-            $backendOpts = ag_set($backendOpts, 'client.timeout', (float)$input->getOption('timeout'));
+            $query['timeout'] = (float)$input->getOption('timeout');
         }
 
         if ($input->getOption('trace')) {
-            $backendOpts = ag_set($backendOpts, 'options.' . Options::DEBUG_TRACE, true);
+            $query[Options::DEBUG_TRACE] = true;
         }
 
         if ($input->getOption('include-raw-response')) {
-            $opts[Options::RAW_RESPONSE] = true;
+            $query[Options::RAW_RESPONSE] = true;
         }
 
-        try {
-            $backend = $this->getBackend($name, $backendOpts);
-        } catch (RuntimeException) {
-            $output->writeln(r("<error>ERROR: Backend '{backend}' not found.</error>", ['backend' => $name]));
+        $url = r('/backend/{backend}/unmatched/{id}', [
+            'backend' => $name,
+            'id' => $id ?? '',
+        ]);
+
+        $response = APIRequest('GET', $url, opts: ['query' => $query]);
+
+        if (HTTP_STATUS::HTTP_OK !== $response->status) {
+            $output->writeln(r('<error>API error. {status}: {message}</error>', [
+                'id' => $id,
+                'status' => $response->status->value,
+                'message' => ag($response->body, 'error.message', 'Unknown error.')
+            ]));
             return self::FAILURE;
         }
 
-        $ids = [];
-        if (null !== $id) {
-            $ids[] = $id;
-        } else {
-            foreach ($backend->listLibraries() as $library) {
-                if (false === (bool)ag($library, 'supported') || true === (bool)ag($library, 'ignored')) {
-                    continue;
-                }
-                $ids[] = ag($library, 'id');
-            }
-        }
-
-        foreach ($ids as $libraryId) {
-            foreach ($backend->getLibrary(id: $libraryId, opts: $opts) as $item) {
-                if (true === $showAll) {
-                    $list[] = $item;
-                    continue;
-                }
-                if (null === ($externals = ag($item, 'guids', null)) || empty($externals)) {
-                    $list[] = $item;
-                }
-            }
-        }
-
-        if (empty($list)) {
-            $arr = [
-                'info' => 'No un-unmatched items were found',
-            ];
-
-            $this->displayContent('table' === $mode ? [$arr] : $arr, $output, $mode);
+        if (empty($response->body)) {
+            $output->writeln(r('<info>No unmatched items found.</info>'));
             return self::SUCCESS;
         }
 
+        $list = $response->body;
+
         if ('table' === $mode) {
             $forTable = [];
 
             foreach ($list as $item) {
+                $via = ag($item, iState::COLUMN_VIA, '-');
+
                 $leaf = [
-                    'id' => ag($item, 'id'),
+                    iState::COLUMN_ID => ag($item, iState::COLUMN_META_DATA . ".{$via}." . iState::COLUMN_ID),
                 ];
 
                 if (!$id) {
-                    $leaf['type'] = ag($item, 'type');
-                    $leaf['library'] = ag($item, 'library');
+                    $leaf[iState::COLUMN_TYPE] = ag($item, iState::COLUMN_TYPE);
+                    $leaf[iState::COLUMN_META_LIBRARY] = ag($item, iState::COLUMN_META_LIBRARY);
                 }
 
                 $title = ag($item, 'title');
@@ -169,13 +149,14 @@ final class UnmatchedCommand extends Command
                     $title = mb_substr($title, 0, $cutoff) . '..';
                 }
 
-                $leaf['title'] = $title;
-                $leaf['year'] = ag($item, 'year');
-
-                if ($showAll) {
-                    $leaf['guids'] = implode(', ', $item['guids'] ?? []);
+                if (null !== ($webUrl = ag($item, 'webUrl'))) {
+                    $leaf[iState::COLUMN_TITLE] = "<href={$webUrl}>{$title}</>";
+                } else {
+                    $leaf[iState::COLUMN_TITLE] = $title;
                 }
 
+                $leaf[iState::COLUMN_YEAR] = ag($item, iState::COLUMN_YEAR);
+
                 $forTable[] = $leaf;
             }