diff --git a/api/Classes/ArtistFetcher.php b/api/Classes/ArtistFetcher.php
new file mode 100644
index 0000000..08b6c14
--- /dev/null
+++ b/api/Classes/ArtistFetcher.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes;
+
+class ArtistFetcher extends PageFetcher
+{
+  public function fetch(string $url): ?array
+  {
+    $cacheKey = "artist_" . md5($url);
+    $cached = $this->cacheGet($cacheKey);
+    if ($cached) return $cached;
+
+    $artist = $this->fetchSingleFromApi("optimized_artists", $url);
+    if (!$artist) return null;
+
+    $this->cacheSet($cacheKey, $artist);
+    return $artist;
+  }
+}
diff --git a/api/Classes/BookFetcher.php b/api/Classes/BookFetcher.php
new file mode 100644
index 0000000..1891967
--- /dev/null
+++ b/api/Classes/BookFetcher.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes;
+
+class BookFetcher extends PageFetcher
+{
+  public function fetch(string $url): ?array
+  {
+    $cacheKey = "book_" . md5($url);
+    $cached = $this->cacheGet($cacheKey);
+    if ($cached) return $cached;
+
+    $book = $this->fetchSingleFromApi("optimized_books", $url);
+    if (!$book) return null;
+
+    $this->cacheSet($cacheKey, $book);
+    return $book;
+  }
+}
diff --git a/api/Classes/GenreFetcher.php b/api/Classes/GenreFetcher.php
new file mode 100644
index 0000000..820741a
--- /dev/null
+++ b/api/Classes/GenreFetcher.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes;
+
+class GenreFetcher extends PageFetcher
+{
+  public function fetch(string $url): ?array
+  {
+    $cacheKey = "genre_" . md5($url);
+    $cached = $this->cacheGet($cacheKey);
+    if ($cached) return $cached;
+
+    $genre = $this->fetchSingleFromApi("optimized_genres", $url);
+    if (!$genre) return null;
+
+    $this->cacheSet($cacheKey, $genre);
+    return $genre;
+  }
+}
diff --git a/api/Classes/MovieFetcher.php b/api/Classes/MovieFetcher.php
new file mode 100644
index 0000000..8a5814b
--- /dev/null
+++ b/api/Classes/MovieFetcher.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes;
+
+class MovieFetcher extends PageFetcher
+{
+  public function fetch(string $url): ?array
+  {
+    $cacheKey = "movie_" . md5($url);
+    $cached = $this->cacheGet($cacheKey);
+    if ($cached) return $cached;
+
+    $movie = $this->fetchSingleFromApi("optimized_movies", $url);
+    if (!$movie) return null;
+
+    $this->cacheSet($cacheKey, $movie);
+    return $movie;
+  }
+}
diff --git a/api/Classes/PageFetcher.php b/api/Classes/PageFetcher.php
new file mode 100644
index 0000000..b94fc51
--- /dev/null
+++ b/api/Classes/PageFetcher.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes;
+
+use App\Classes\BaseHandler;
+
+abstract class PageFetcher extends BaseHandler
+{
+  protected function cacheGet(string $key): mixed
+  {
+    return $this->cache && $this->cache->exists($key) ? json_decode($this->cache->get($key), true) : null;
+  }
+
+  protected function cacheSet(string $key, mixed $value, int $ttl = 3600): void
+  {
+    if ($this->cache) $this->cache->setex($key, $ttl, json_encode($value));
+  }
+
+  protected function fetchSingleFromApi(string $endpoint, string $url): ?array
+  {
+    $data = $this->fetchFromApi($endpoint, "url=eq./{$url}");
+    return $data[0] ?? null;
+  }
+
+  protected function fetchPostRpc(string $endpoint, array $body): ?array
+  {
+    return $this->makeRequest("POST", $endpoint, ['json' => $body]);
+  }
+}
diff --git a/api/Classes/ShowFetcher.php b/api/Classes/ShowFetcher.php
new file mode 100644
index 0000000..4fb0f80
--- /dev/null
+++ b/api/Classes/ShowFetcher.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes;
+
+class ShowFetcher extends PageFetcher
+{
+  public function fetch(string $url): ?array
+  {
+    $cacheKey = "show_" . md5($url);
+    $cached = $this->cacheGet($cacheKey);
+    if ($cached) return $cached;
+
+    $show = $this->fetchSingleFromApi("optimized_shows", $url);
+    if (!$show) return null;
+
+    $this->cacheSet($cacheKey, $show);
+    return $show;
+  }
+}
diff --git a/api/Classes/TagFetcher.php b/api/Classes/TagFetcher.php
new file mode 100644
index 0000000..f0fce05
--- /dev/null
+++ b/api/Classes/TagFetcher.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes;
+
+class TagFetcher extends PageFetcher
+{
+  public function fetch(string $tag, int $page = 1, int $pageSize = 20): ?array
+  {
+    $offset = ($page - 1) * $pageSize;
+    $cacheKey = "tag_" . md5("{$tag}_{$page}");
+
+    $cached = $this->cacheGet($cacheKey);
+    if ($cached) return $cached;
+
+    $results = $this->fetchPostRpc("rpc/get_tagged_content", [
+      "tag_query" => $tag,
+      "page_size" => $pageSize,
+      "page_offset" => $offset
+    ]);
+
+    if (!$results || count($results) === 0) return null;
+
+    $this->cacheSet($cacheKey, $results);
+    return $results;
+  }
+}
diff --git a/api/artist-import.php b/api/artist-import.php
index 70a5934..d7b3b4d 100644
--- a/api/artist-import.php
+++ b/api/artist-import.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . "/Classes/ApiHandler.php";
+require __DIR__ . "/../vendor/autoload.php";
 require __DIR__ . "/Utils/init.php";
 
 use App\Classes\ApiHandler;
diff --git a/api/book-import.php b/api/book-import.php
index 4d52b0f..da1acad 100644
--- a/api/book-import.php
+++ b/api/book-import.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . "/Classes/ApiHandler.php";
+require __DIR__ . "/../vendor/autoload.php";
 
 use App\Classes\ApiHandler;
 use GuzzleHttp\Client;
diff --git a/api/contact.php b/api/contact.php
index b440ad0..572df0e 100644
--- a/api/contact.php
+++ b/api/contact.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . "/Classes/BaseHandler.php";
+require __DIR__ . "/../vendor/autoload.php";
 
 use App\Classes\BaseHandler;
 use GuzzleHttp\Client;
diff --git a/api/mastodon.php b/api/mastodon.php
index df96a7c..7b069ee 100644
--- a/api/mastodon.php
+++ b/api/mastodon.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . "/Classes/ApiHandler.php";
+require __DIR__ . "/../vendor/autoload.php";
 
 use App\Classes\ApiHandler;
 use GuzzleHttp\Client;
diff --git a/api/oembed.php b/api/oembed.php
index 2f7f067..401ab6f 100644
--- a/api/oembed.php
+++ b/api/oembed.php
@@ -1,7 +1,7 @@
 <?php
 
+require __DIR__ . "/../vendor/autoload.php";
 require __DIR__ . '/../server/utils/init.php';
-require __DIR__ . "/Classes/BaseHandler.php";
 
 use App\Classes\BaseHandler;
 use GuzzleHttp\Client;
diff --git a/api/playing.php b/api/playing.php
index 7cb8506..27bd226 100644
--- a/api/playing.php
+++ b/api/playing.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace App\Handlers;
-
-require __DIR__ . "/Classes/BaseHandler.php";
+require __DIR__ . "/../vendor/autoload.php";
 
 use App\Classes\BaseHandler;
 
diff --git a/api/query.php b/api/query.php
index 94eba93..9c77670 100644
--- a/api/query.php
+++ b/api/query.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Classes\BaseHandler;
-
+require __DIR__ . "/../vendor/autoload.php";
 require __DIR__ . '/../server/utils/init.php';
-require __DIR__ . "/Classes/BaseHandler.php";
+
+use App\Classes\BaseHandler;
 
 class QueryHandler extends BaseHandler
 {
diff --git a/api/scrobble.php b/api/scrobble.php
index 80353a2..270256a 100644
--- a/api/scrobble.php
+++ b/api/scrobble.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace App\Handlers;
-
-require __DIR__ . "/Classes/ApiHandler.php";
+require __DIR__ . "/../vendor/autoload.php";
 require __DIR__ . "/Utils/init.php";
 
 use App\Classes\ApiHandler;
diff --git a/api/search.php b/api/search.php
index c313955..6a36904 100644
--- a/api/search.php
+++ b/api/search.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace App\Handlers;
-
-require __DIR__ . "/Classes/BaseHandler.php";
+require __DIR__ . "/../vendor/autoload.php";
 
 use App\Classes\BaseHandler;
 
diff --git a/api/seasons-import.php b/api/seasons-import.php
index 2e18bd4..8879942 100644
--- a/api/seasons-import.php
+++ b/api/seasons-import.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . "/Classes/ApiHandler.php";
+require __DIR__ . "/../vendor/autoload.php";
 
 use App\Classes\ApiHandler;
 use GuzzleHttp\Client;
diff --git a/api/umami.php b/api/umami.php
new file mode 100644
index 0000000..eb2a3c2
--- /dev/null
+++ b/api/umami.php
@@ -0,0 +1,42 @@
+<?php
+  $remoteUrl = 'https://stats.apps.coryd.dev/script.js';
+  $cacheKey = 'remote_stats_script';
+  $ttl = 3600;
+  $js = null;
+  $code = 200;
+  $redis = null;
+
+  try {
+    if (extension_loaded('redis')) {
+      $redis = new Redis();
+      $redis->connect('127.0.0.1', 6379);
+
+      if ($redis->exists($cacheKey)) $js = $redis->get($cacheKey);
+    }
+  } catch (Exception $e) {
+    error_log("Redis unavailable: " . $e->getMessage());
+  }
+
+  if (!is_string($js)) {
+    $ch = curl_init($remoteUrl);
+
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_HEADER, false);
+
+    $js = curl_exec($ch);
+    $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+    curl_close($ch);
+
+    if ($redis && $code === 200 && $js) $redis->setex($cacheKey, $ttl, $js);
+  }
+
+  if (!is_string($js) || trim($js) === '') {
+    $js = '// Failed to fetch remote script';
+    $code = 502;
+  }
+
+  http_response_code($code);
+  header('Content-Type: application/javascript; charset=UTF-8');
+  header('Cache-Control: public, max-age=60');
+  echo $js;
diff --git a/api/watching-import.php b/api/watching-import.php
index 66ab1ba..7741c24 100644
--- a/api/watching-import.php
+++ b/api/watching-import.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . "/Classes/ApiHandler.php";
+require __DIR__ . "/../vendor/autoload.php";
 
 use App\Classes\ApiHandler;
 use GuzzleHttp\Client;
diff --git a/composer.json b/composer.json
index 2c1a7eb..ce7f670 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
   },
   "autoload": {
     "psr-4": {
-      "App\\": "src/"
+      "App\\Classes\\": "api/Classes/"
     }
   },
   "config": {
diff --git a/package-lock.json b/package-lock.json
index 4418189..fb12e1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "4.3.3",
+  "version": "5.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "4.3.3",
+      "version": "5.0.0",
       "license": "MIT",
       "dependencies": {
         "html-minifier-terser": "7.2.0",
@@ -1737,9 +1737,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.152",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.152.tgz",
-      "integrity": "sha512-xBOfg/EBaIlVsHipHl2VdTPJRSvErNUaqW8ejTq5OlOlIYx1wOllCHsAvAIrr55jD1IYEfdR86miUEt8H5IeJg==",
+      "version": "1.5.153",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.153.tgz",
+      "integrity": "sha512-4bwluTFwjXZ0/ei1qDpHDGzVveuBfx4wiZ9VQ8j/30+T2JxSF2TfZ00d1X+wNMeDyUdZXgLkJFbarJdAMtd+/w==",
       "dev": true,
       "license": "ISC"
     },
diff --git a/package.json b/package.json
index f09837d..0034e27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "4.3.3",
+  "version": "5.0.0",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "engines": {
diff --git a/src/includes/fetchers/artist.php.liquid b/src/includes/fetchers/artist.php.liquid
index d120e80..8b96440 100644
--- a/src/includes/fetchers/artist.php.liquid
+++ b/src/includes/fetchers/artist.php.liquid
@@ -1,84 +1,35 @@
 <?php
+
   require __DIR__ . "/../../vendor/autoload.php";
   require __DIR__ . "/../../server/utils/init.php";
 
-  use GuzzleHttp\Client;
+  use App\Classes\ArtistFetcher;
   use voku\helper\HtmlMin;
 
   $requestUri = $_SERVER["REQUEST_URI"];
   $url = trim(parse_url($requestUri, PHP_URL_PATH), "/");
-  $postgrestUrl = $_ENV["POSTGREST_URL"] ?? getenv("POSTGREST_URL");
-  $postgrestApiKey = $_ENV["POSTGREST_API_KEY"] ?? getenv("POSTGREST_API_KEY");
 
   if (strpos($url, "music/artists/") !== 0) {
     echo file_get_contents(__DIR__ . "/../../404/index.html");
     exit();
   }
 
-  $cacheKey = "artist_" . md5($url);
-  $artist = null;
-  $useRedis = false;
+  $fetcher = new ArtistFetcher();
+  $artist = $fetcher->fetch($url);
 
-  try {
-    if (extension_loaded('redis')) {
-      $redis = new Redis();
-      $redis->connect('127.0.0.1', 6379);
-      $useRedis = true;
-    }
-  } catch (Exception $e) {
-    error_log("Redis not available: " . $e->getMessage());
-  }
-
-  if ($useRedis && $redis->exists($cacheKey)) {
-    $artist = json_decode($redis->get($cacheKey), true);
-  } else {
-    $apiUrl = "$postgrestUrl/optimized_artists?url=eq./" . $url;
-    $client = new Client();
-
-    try {
-      $response = $client->request("GET", $apiUrl, [
-        "headers" => [
-          "Accept" => "application/json",
-          "Authorization" => "Bearer {$postgrestApiKey}",
-        ],
-      ]);
-
-      $artistData = json_decode($response->getBody(), true);
-
-      if (!$artistData) {
-        echo file_get_contents(__DIR__ . "/../../404/index.html");
-        exit();
-      }
-
-      $artist = $artistData[0];
-
-      if ($useRedis) {
-        $redis->setex($cacheKey, 3600, json_encode($artist));
-      }
-    } catch (Exception $e) {
-      error_log($e->getMessage());
-      echo file_get_contents(__DIR__ . "/../../404/index.html");
-      exit();
-    }
+  if (!$artist) {
+    echo file_get_contents(__DIR__ . "/../../404/index.html");
+    exit();
   }
 
   $artist["description"] = parseMarkdown($artist["description"]);
-  $pageTitle = htmlspecialchars(
-    "Artists • " . $artist["name"],
-    ENT_QUOTES,
-    "UTF-8"
-  );
-  $pageDescription = truncateText(htmlspecialchars(
-    strip_tags($artist["description"]),
-    ENT_QUOTES,
-    "UTF-8"
-  ), 250);
+  $pageTitle = htmlspecialchars("Artists • " . $artist["name"], ENT_QUOTES, "UTF-8");
+  $pageDescription = truncateText(htmlspecialchars(strip_tags($artist["description"]), ENT_QUOTES, "UTF-8"), 250);
   $ogImage = htmlspecialchars($artist["image"], ENT_QUOTES, "UTF-8");
   $fullUrl = "https://www.coryd.dev" . $requestUri;
   $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;
 
   ob_start();
-
   header("Cache-Control: public, max-age=3600");
   header("Expires: " . gmdate("D, d M Y H:i:s", time() + 3600) . " GMT");
 ?>
diff --git a/src/includes/fetchers/book.php.liquid b/src/includes/fetchers/book.php.liquid
index 3818280..e72c94e 100644
--- a/src/includes/fetchers/book.php.liquid
+++ b/src/includes/fetchers/book.php.liquid
@@ -1,14 +1,13 @@
 <?php
+
   require __DIR__ . "/../vendor/autoload.php";
   require __DIR__ . "/../server/utils/init.php";
 
-  use GuzzleHttp\Client;
+  use App\Classes\BookFetcher;
   use voku\helper\HtmlMin;
 
   $requestUri = $_SERVER["REQUEST_URI"];
   $url = trim(parse_url($requestUri, PHP_URL_PATH), "/");
-  $postgrestUrl = $_ENV["POSTGREST_URL"] ?? getenv("POSTGREST_URL");
-  $postgrestApiKey = $_ENV["POSTGREST_API_KEY"] ?? getenv("POSTGREST_API_KEY");
 
   if (preg_match('/^books\/years\/(\d{4})$/', $url, $matches)) {
     $year = $matches[1];
@@ -23,13 +22,9 @@
     }
   }
 
-  if ($url === "books/years") {
-    echo file_get_contents(__DIR__ . "/../404/index.html");
-    exit();
-  }
-
-  if ($url === "books") {
-    readfile("index.html");
+  if ($url === "books/years" || $url === "books") {
+    $indexPath = $url === "books" ? "index.html" : __DIR__ . "/../404/index.html";
+    readfile($indexPath);
     exit();
   }
 
@@ -38,70 +33,22 @@
     exit();
   }
 
-  $cacheKey = "book_" . md5($url);
+  $fetcher = new BookFetcher();
+  $book = $fetcher->fetch($url);
 
-  $book = null;
-  $useRedis = false;
-  try {
-    if (extension_loaded('redis')) {
-      $redis = new Redis();
-      $redis->connect('127.0.0.1', 6379);
-      $useRedis = true;
-    }
-  } catch (Exception $e) {
-    error_log("Redis not available: " . $e->getMessage());
-  }
-
-  if ($useRedis && $redis->exists($cacheKey)) {
-    $book = json_decode($redis->get($cacheKey), true);
-  } else {
-    $apiUrl = "$postgrestUrl/optimized_books?url=eq./" . $url;
-    $client = new Client();
-
-    try {
-      $response = $client->request("GET", $apiUrl, [
-        "headers" => [
-          "Accept" => "application/json",
-          "Authorization" => "Bearer {$postgrestApiKey}",
-        ],
-      ]);
-
-      $bookData = json_decode($response->getBody(), true);
-
-      if (!$bookData) {
-        echo file_get_contents(__DIR__ . "/../404/index.html");
-        exit();
-      }
-
-      $book = $bookData[0];
-
-      if ($useRedis) {
-        $redis->setex($cacheKey, 3600, json_encode($book));
-      }
-    } catch (Exception $e) {
-      error_log($e->getMessage());
-      echo file_get_contents(__DIR__ . "/../404/index.html");
-      exit();
-    }
+  if (!$book) {
+    echo file_get_contents(__DIR__ . "/../404/index.html");
+    exit();
   }
 
   $book["description"] = parseMarkdown($book["description"]);
-  $pageTitle = htmlspecialchars(
-    "Books • " . $book["title"] . " by " . $book["author"],
-    ENT_QUOTES,
-    "UTF-8"
-  );
-  $pageDescription = truncateText(htmlspecialchars(
-    strip_tags($book["description"]),
-    ENT_QUOTES,
-    "UTF-8"
-  ), 250);
+  $pageTitle = htmlspecialchars("Books • {$book["title"]} by {$book["author"]}", ENT_QUOTES, "UTF-8");
+  $pageDescription = truncateText(htmlspecialchars(strip_tags($book["description"]), ENT_QUOTES, "UTF-8"), 250);
   $ogImage = htmlspecialchars($book["image"], ENT_QUOTES, "UTF-8");
   $fullUrl = "https://www.coryd.dev" . $requestUri;
   $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;
 
   ob_start();
-
   header("Cache-Control: public, max-age=3600");
   header("Expires: " . gmdate("D, d M Y H:i:s", time() + 3600) . " GMT");
 ?>
diff --git a/src/includes/fetchers/genre.php.liquid b/src/includes/fetchers/genre.php.liquid
index 3f0c5ad..8816c65 100644
--- a/src/includes/fetchers/genre.php.liquid
+++ b/src/includes/fetchers/genre.php.liquid
@@ -1,75 +1,37 @@
 <?php
+
   require __DIR__ . "/../../vendor/autoload.php";
   require __DIR__ . "/../../server/utils/init.php";
 
-  use GuzzleHttp\Client;
+  use App\Classes\GenreFetcher;
   use voku\helper\HtmlMin;
 
   $requestUri = $_SERVER["REQUEST_URI"];
   $url = trim(parse_url($requestUri, PHP_URL_PATH), "/");
-  $postgrestUrl = $_ENV["POSTGREST_URL"] ?? getenv("POSTGREST_URL");
-  $postgrestApiKey = $_ENV["POSTGREST_API_KEY"] ?? getenv("POSTGREST_API_KEY");
 
   if (!preg_match('/^music\/genres\/[\w-]+$/', $url)) {
     echo file_get_contents(__DIR__ . "/../../404/index.html");
     exit();
   }
 
-  $cacheKey = "genre_" . md5($url);
-  $genre = null;
-  $useRedis = false;
+  $fetcher = new GenreFetcher();
+  $genre = $fetcher->fetch($url);
 
-  try {
-    if (extension_loaded('redis')) {
-      $redis = new Redis();
-      $redis->connect('127.0.0.1', 6379);
-      $useRedis = true;
-    }
-  } catch (Exception $e) {
-    error_log("Redis not available: " . $e->getMessage());
-  }
-
-  if ($useRedis && $redis->exists($cacheKey)) {
-    $genre = json_decode($redis->get($cacheKey), true);
-  } else {
-    $apiUrl = "$postgrestUrl/optimized_genres?url=eq./" . $url;
-    $client = new Client();
-
-    try {
-      $response = $client->request("GET", $apiUrl, [
-        "headers" => [
-          "Accept" => "application/json",
-          "Authorization" => "Bearer {$postgrestApiKey}",
-        ],
-      ]);
-
-      $genreData = json_decode($response->getBody(), true);
-
-      if (!$genreData) {
-        echo file_get_contents(__DIR__ . "/../../404/index.html");
-        exit();
-      }
-
-      $genre = $genreData[0];
-
-      if ($useRedis) {
-        $redis->setex($cacheKey, 3600, json_encode($genre));
-      }
-    } catch (Exception $e) {
-      error_log($e->getMessage());
-      echo file_get_contents(__DIR__ . "/../../404/index.html");
-      exit();
-    }
+  if (!$genre) {
+    echo file_get_contents(__DIR__ . "/../../404/index.html");
+    exit();
   }
 
   $pageTitle = htmlspecialchars("Genres • " . $genre["name"], ENT_QUOTES, "UTF-8");
-  $pageDescription = truncateText(htmlspecialchars(strip_tags($genre["description"]), ENT_QUOTES, "UTF-8"), 250);
-  $ogImage = htmlspecialchars($genre["artists"][0]["image"], ENT_QUOTES, "UTF-8");
+  $pageDescription = truncateText(
+    htmlspecialchars(strip_tags($genre["description"]), ENT_QUOTES, "UTF-8"),
+    250
+  );
+  $ogImage = htmlspecialchars($genre["artists"][0]["image"] ?? "", ENT_QUOTES, "UTF-8");
   $fullUrl = "https://www.coryd.dev" . $requestUri;
   $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;
 
   ob_start();
-
   header("Cache-Control: public, max-age=3600");
   header("Expires: " . gmdate("D, d M Y H:i:s", time() + 3600) . " GMT");
 ?>
diff --git a/src/includes/fetchers/movie.php.liquid b/src/includes/fetchers/movie.php.liquid
index 02dd36b..53a3812 100644
--- a/src/includes/fetchers/movie.php.liquid
+++ b/src/includes/fetchers/movie.php.liquid
@@ -1,84 +1,35 @@
 <?php
+
   require __DIR__ . "/../../vendor/autoload.php";
   require __DIR__ . "/../../server/utils/init.php";
 
-  use GuzzleHttp\Client;
+  use App\Classes\MovieFetcher;
   use voku\helper\HtmlMin;
 
   $requestUri = $_SERVER["REQUEST_URI"];
   $url = trim(parse_url($requestUri, PHP_URL_PATH), "/");
-  $postgrestUrl = $_ENV["POSTGREST_URL"] ?? getenv("POSTGREST_URL");
-  $postgrestApiKey = $_ENV["POSTGREST_API_KEY"] ?? getenv("POSTGREST_API_KEY");
 
   if (!preg_match('/^watching\/movies\/[\w-]+$/', $url)) {
     echo file_get_contents(__DIR__ . "/../../404/index.html");
     exit();
   }
 
-  $cacheKey = "movie_" . md5($url);
-  $movie = null;
-  $useRedis = false;
+  $fetcher = new MovieFetcher();
+  $movie = $fetcher->fetch($url);
 
-  try {
-    if (extension_loaded('redis')) {
-      $redis = new Redis();
-      $redis->connect('127.0.0.1', 6379);
-      $useRedis = true;
-    }
-  } catch (Exception $e) {
-    error_log("Redis not available: " . $e->getMessage());
-  }
-
-  if ($useRedis && $redis->exists($cacheKey)) {
-    $movie = json_decode($redis->get($cacheKey), true);
-  } else {
-    $apiUrl = "$postgrestUrl/optimized_movies?url=eq./" . $url;
-    $client = new Client();
-
-    try {
-      $response = $client->request("GET", $apiUrl, [
-        "headers" => [
-          "Accept" => "application/json",
-          "Authorization" => "Bearer {$postgrestApiKey}",
-        ],
-      ]);
-
-      $movieData = json_decode($response->getBody(), true);
-
-      if (!$movieData) {
-        echo file_get_contents(__DIR__ . "/../../404/index.html");
-        exit();
-      }
-
-      $movie = $movieData[0];
-
-      if ($useRedis) {
-        $redis->setex($cacheKey, 3600, json_encode($movie));
-      }
-    } catch (Exception $e) {
-      error_log($e->getMessage());
-      echo file_get_contents(__DIR__ . "/../../404/index.html");
-      exit();
-    }
+  if (!$movie) {
+    echo file_get_contents(__DIR__ . "/../../404/index.html");
+    exit();
   }
 
   $movie["description"] = parseMarkdown($movie["description"]);
-  $pageTitle = htmlspecialchars(
-    "Movies • " . $movie["title"],
-    ENT_QUOTES,
-    "UTF-8"
-  );
-  $pageDescription = truncateText(htmlspecialchars(
-    strip_tags($movie["description"]),
-    ENT_QUOTES,
-    "UTF-8"
-  ), 250);
+  $pageTitle = htmlspecialchars("Movies • " . $movie["title"], ENT_QUOTES, "UTF-8");
+  $pageDescription = truncateText(htmlspecialchars(strip_tags($movie["description"]), ENT_QUOTES, "UTF-8"), 250);
   $ogImage = htmlspecialchars($movie["backdrop"], ENT_QUOTES, "UTF-8");
   $fullUrl = "https://www.coryd.dev" . $requestUri;
   $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;
 
   ob_start();
-
   header("Cache-Control: public, max-age=3600");
   header("Expires: " . gmdate("D, d M Y H:i:s", time() + 3600) . " GMT");
 ?>
diff --git a/src/includes/fetchers/show.php.liquid b/src/includes/fetchers/show.php.liquid
index 1466f4a..2e38f1b 100644
--- a/src/includes/fetchers/show.php.liquid
+++ b/src/includes/fetchers/show.php.liquid
@@ -1,75 +1,37 @@
 <?php
+
   require __DIR__ . "/../../vendor/autoload.php";
   require __DIR__ . "/../../server/utils/init.php";
 
-  use GuzzleHttp\Client;
+  use App\Classes\ShowFetcher;
   use voku\helper\HtmlMin;
 
   $requestUri = $_SERVER["REQUEST_URI"];
   $url = trim(parse_url($requestUri, PHP_URL_PATH), "/");
-  $postgrestUrl = $_ENV["POSTGREST_URL"] ?? getenv("POSTGREST_URL");
-  $postgrestApiKey = $_ENV["POSTGREST_API_KEY"] ?? getenv("POSTGREST_API_KEY");
 
   if (!preg_match('/^watching\/shows\/[\w-]+$/', $url)) {
     echo file_get_contents(__DIR__ . "/../../404/index.html");
     exit();
   }
 
-  $cacheKey = "show_" . md5($url);
-  $show = null;
-  $useRedis = false;
+  $fetcher = new ShowFetcher();
+  $show = $fetcher->fetch($url);
 
-  try {
-    if (extension_loaded('redis')) {
-      $redis = new Redis();
-      $redis->connect('127.0.0.1', 6379);
-      $useRedis = true;
-    }
-  } catch (Exception $e) {
-    error_log("Redis not available: " . $e->getMessage());
-  }
-
-  if ($useRedis && $redis->exists($cacheKey)) {
-    $show = json_decode($redis->get($cacheKey), true);
-  } else {
-    $apiUrl = "$postgrestUrl/optimized_shows?url=eq./" . $url;
-    $client = new Client();
-
-    try {
-      $response = $client->request("GET", $apiUrl, [
-        "headers" => [
-          "Accept" => "application/json",
-          "Authorization" => "Bearer {$postgrestApiKey}",
-        ],
-      ]);
-
-      $showData = json_decode($response->getBody(), true);
-
-      if (!$showData) {
-        echo file_get_contents(__DIR__ . "/../../404/index.html");
-        exit();
-      }
-
-      $show = $showData[0];
-
-      if ($useRedis) {
-        $redis->setex($cacheKey, 3600, json_encode($show));
-      }
-    } catch (Exception $e) {
-      error_log($e->getMessage());
-      echo file_get_contents(__DIR__ . "/../../404/index.html");
-      exit();
-    }
+  if (!$show) {
+    echo file_get_contents(__DIR__ . "/../../404/index.html");
+    exit();
   }
 
   $pageTitle = htmlspecialchars("Show • " . $show["title"], ENT_QUOTES, "UTF-8");
-  $pageDescription = truncateText(htmlspecialchars(strip_tags($show["description"]), ENT_QUOTES, "UTF-8"), 250);
+  $pageDescription = truncateText(
+    htmlspecialchars(strip_tags($show["description"]), ENT_QUOTES, "UTF-8"),
+    250
+  );
   $ogImage = htmlspecialchars($show["image"], ENT_QUOTES, "UTF-8");
   $fullUrl = "https://www.coryd.dev" . $requestUri;
   $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;
 
   ob_start();
-
   header("Cache-Control: public, max-age=3600");
   header("Expires: " . gmdate("D, d M Y H:i:s", time() + 3600) . " GMT");
 ?>
diff --git a/src/includes/fetchers/tags.php.liquid b/src/includes/fetchers/tags.php.liquid
index 3eba3d2..2919d02 100644
--- a/src/includes/fetchers/tags.php.liquid
+++ b/src/includes/fetchers/tags.php.liquid
@@ -1,109 +1,64 @@
 <?php
-require __DIR__ . "/../vendor/autoload.php";
-require __DIR__ . "/../server/utils/init.php";
 
-use GuzzleHttp\Client;
-use voku\helper\HtmlMin;
+  require __DIR__ . "/../vendor/autoload.php";
+  require __DIR__ . "/../server/utils/init.php";
 
-$requestUri = $_SERVER["REQUEST_URI"];
-$url = trim(parse_url($requestUri, PHP_URL_PATH), "/");
-$postgrestUrl = $_ENV["POSTGREST_URL"] ?? getenv("POSTGREST_URL");
-$postgrestApiKey = $_ENV["POSTGREST_API_KEY"] ?? getenv("POSTGREST_API_KEY");
+  use App\Classes\TagFetcher;
+  use voku\helper\HtmlMin;
 
-if ($url === "tags") {
-  readfile("index.html");
-  exit();
-}
+  $requestUri = $_SERVER["REQUEST_URI"];
+  $url = trim(parse_url($requestUri, PHP_URL_PATH), "/");
 
-if (!preg_match('/^tags\/(.+?)(?:\/(\d+))?$/', $url, $matches)) {
-  echo file_get_contents(__DIR__ . "/../404/index.html");
-  exit();
-}
-
-if (isset($matches[2]) && (int)$matches[2] === 1) {
-  header("Location: /tags/{$matches[1]}", true, 301);
-  exit();
-}
-
-$tag = strtolower(urldecode($matches[1]));
-
-if (!preg_match('/^[\p{L}\p{N} _\.\-\&]+$/u', $tag)) {
-  echo file_get_contents(__DIR__ . "/../404/index.html");
-  exit();
-}
-
-$pageParam = isset($matches[2]) ? (int)$matches[2] : 0;
-$page = max($pageParam, 1);
-$pageSize = 20;
-$offset = ($page - 1) * $pageSize;
-
-$cacheKey = "tag_{$tag}_{$page}";
-$useRedis = false;
-$tagged = null;
-
-try {
-  if (extension_loaded('redis')) {
-    $redis = new Redis();
-    $redis->connect('127.0.0.1', 6379);
-    $useRedis = true;
+  if ($url === "tags") {
+    readfile("index.html");
+    exit();
   }
-} catch (Exception $e) {
-  error_log("Redis not available: " . $e->getMessage());
-}
 
-if ($useRedis && $redis->exists($cacheKey)) {
-  $tagged = json_decode($redis->get($cacheKey), true);
-} else {
-  $client = new Client();
-  try {
-    $response = $client->post($postgrestUrl . '/rpc/get_tagged_content', [
-      'headers' => [
-        'Content-Type' => 'application/json',
-        'Authorization' => "Bearer {$postgrestApiKey}",
-      ],
-      'json' => [
-        'tag_query' => $tag,
-        'page_size' => $pageSize,
-        'page_offset' => $offset
-      ]
-    ]);
+  if (!preg_match('/^tags\/(.+?)(?:\/(\d+))?$/', $url, $matches)) {
+    echo file_get_contents(__DIR__ . "/../404/index.html");
+    exit();
+  }
 
-    $tagged = json_decode($response->getBody(), true);
-    if ($useRedis) {
-      $redis->setex($cacheKey, 3600, json_encode($tagged));
-    }
-  } catch (Exception $e) {
-    error_log($e->getMessage());
+  if (isset($matches[2]) && (int)$matches[2] === 1) {
+    header("Location: /tags/{$matches[1]}", true, 301);
+    exit();
+  }
+
+  $tag = strtolower(urldecode($matches[1]));
+
+  if (!preg_match('/^[\p{L}\p{N} _\.\-\&]+$/u', $tag)) {
+    echo file_get_contents(__DIR__ . "/../404/index.html");
+    exit();
+  }
+
+  $page = isset($matches[2]) ? max(1, (int)$matches[2]) : 1;
+  $pageSize = 20;
+  $fetcher = new TagFetcher();
+  $tagged = $fetcher->fetch($tag, $page, $pageSize);
+
+  if (!$tagged || count($tagged) === 0) {
     echo file_get_contents(__DIR__ . '/../404/index.html');
     exit();
   }
-}
 
-if (!$tagged || count($tagged) === 0) {
-  echo file_get_contents(__DIR__ . '/../404/index.html');
-  exit();
-}
+  $totalCount = $tagged[0]['total_count'] ?? 0;
+  $totalPages = max(ceil($totalCount / $pageSize), 1);
+  $pagination = [
+    'pageNumber' => $page,
+    'pages' => range(1, $totalPages),
+    'href' => [
+      'previous' => $page > 1 ? "/tags/{$tag}/" . ($page - 1) : null,
+      'next' => $page < $totalPages ? "/tags/{$tag}/" . ($page + 1) : null
+    ],
+    'links' => range(1, $totalPages)
+  ];
 
-$totalCount = $tagged[0]['total_count'] ?? 0;
-$totalPages = max(ceil($totalCount / $pageSize), 1);
-$pagination = [
-  'pageNumber' => $page,
-  'pages' => range(1, $totalPages),
-  'href' => [
-    'previous' => $page > 1 ? "/tags/{$tag}/" . ($page - 1) : null,
-    'next' => $page < $totalPages ? "/tags/{$tag}/" . ($page + 1) : null
-  ],
-  'links' => range(1, $totalPages)
-];
-
-$pageTitle = "#" . strtolower(ucfirst($tag)) . "";
-$pageDescription = "All content tagged with #" . strtolower(ucfirst($tag)) . ".";
-$fullUrl = "https://www.coryd.dev" . $requestUri;
-$oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;
-
-ob_start();
-
-header("Cache-Control: public, max-age=3600");
-header("Expires: " . gmdate("D, d M Y H:i:s", time() + 3600) . " GMT");
+  $pageTitle = "#" . strtolower(ucfirst($tag));
+  $pageDescription = "All content tagged with #" . strtolower(ucfirst($tag)) . ".";
+  $fullUrl = "https://www.coryd.dev" . $requestUri;
+  $oembedUrl = "https://www.coryd.dev/oembed" . $requestUri;
 
+  ob_start();
+  header("Cache-Control: public, max-age=3600");
+  header("Expires: " . gmdate("D, d M Y H:i:s", time() + 3600) . " GMT");
 ?>
diff --git a/src/layouts/base.liquid b/src/layouts/base.liquid
index 72331a4..a739fb9 100644
--- a/src/layouts/base.liquid
+++ b/src/layouts/base.liquid
@@ -28,7 +28,7 @@
       eleventy:eleventy
     %}
     <script defer src="/assets/scripts/index.js?v={% appVersion %}"></script>
-    <script defer src="https://stats.apps.coryd.dev/script.js?v={% appVersion %}" data-website-id="a30f4735-6c27-4761-b180-a8f247a4a3a3"></script>
+    <script defer src="/assets/scripts/util.js?v={% appVersion %}" data-host-url="https://stats.apps.coryd.dev" data-website-id="a30f4735-6c27-4761-b180-a8f247a4a3a3"></script>
   </head>
   <body>
     <div class="main-wrapper">
diff --git a/src/meta/htaccess.liquid b/src/meta/htaccess.liquid
index fa928c9..618d4a5 100644
--- a/src/meta/htaccess.liquid
+++ b/src/meta/htaccess.liquid
@@ -59,6 +59,9 @@ RewriteRule ^og/([a-z0-9\-]+)/([\d\.]+)/([a-f0-9\-]+)\.([a-z0-9]+)$ /api/og-imag
 RewriteRule ^oembed/?$ /api/oembed.php [L]
 RewriteRule ^oembed/(.+)$ /api/oembed.php?url=https://www.coryd.dev/$1 [L,QSA]
 
+## analytics
+RewriteRule ^assets/scripts/util\.js$ /api/umami.php [L]
+
 {% for redirect in redirects -%}
 Redirect {{ redirect.status_code | default: "301" }} {{ redirect.source_url }} {{ redirect.destination_url }}
 {% endfor -%}