diff --git a/package-lock.json b/package-lock.json
index 09add7a1..a3aa69a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "1.5.20",
+  "version": "1.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "1.5.20",
+      "version": "1.6.0",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.5.0",
diff --git a/package.json b/package.json
index 63fb121e..28ef7b50 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "1.5.20",
+  "version": "1.6.0",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "engines": {
diff --git a/queries/functions/search.psql b/queries/functions/search.psql
index 1b4165b7..1aa3275c 100644
--- a/queries/functions/search.psql
+++ b/queries/functions/search.psql
@@ -13,7 +13,8 @@ CREATE OR REPLACE FUNCTION public.search_optimized_index(
     genre_url text,
     type text,
     total_plays integer,
-    rank real
+    rank real,
+    total_count bigint
 ) AS $$
 BEGIN
     RETURN QUERY
@@ -30,13 +31,17 @@ BEGIN
         ts_rank_cd(
             to_tsvector('english', s.title || ' ' || s.description || array_to_string(s.tags, ' ')),
             plainto_tsquery('english', search_query)
-        ) AS rank
+        ) AS rank,
+        COUNT(*) OVER () AS total_count
     FROM optimized_search_index s
     WHERE
         (types IS NULL OR s.type = ANY(types))
         AND plainto_tsquery('english', search_query) @@
             to_tsvector('english', s.title || ' ' || s.description || array_to_string(s.tags, ' '))
-    ORDER BY rank DESC
+    ORDER BY
+        s.type = 'post' DESC,
+        s.content_date DESC NULLS LAST,
+        rank DESC
     LIMIT page_size OFFSET page_offset;
 END;
 $$ LANGUAGE plpgsql;
\ No newline at end of file
diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js
index a88e1e34..9154610d 100644
--- a/src/assets/scripts/index.js
+++ b/src/assets/scripts/index.js
@@ -131,7 +131,7 @@ window.addEventListener("load", () => {
     let currentPage = 1;
     let currentResults = [];
     let total = 0;
-    let debounceTimeout; // Declare debounceTimeout here
+    let debounceTimeout;
 
     const parseMarkdown = (markdown) =>
       markdown
diff --git a/workers/search/index.js b/workers/search/index.js
index 928a38a3..061b7880 100644
--- a/workers/search/index.js
+++ b/workers/search/index.js
@@ -25,10 +25,15 @@ export default {
 
       if (error) {
         console.error("Error fetching search data:", error);
-        return new Response(JSON.stringify({ results: [] }), { status: 500 });
+        return new Response(JSON.stringify({ results: [], total: 0 }), {
+          status: 500,
+        });
       }
 
-      return new Response(JSON.stringify({ results: data }), {
+      const total = data.length > 0 ? data[0].total_count : 0;
+      const results = data.map(({ total_count, ...item }) => item);
+
+      return new Response(JSON.stringify({ results, total, page, pageSize }), {
         headers: { "Content-Type": "application/json" },
       });
     } catch (error) {
@@ -36,4 +41,4 @@ export default {
       return new Response("Internal Server Error", { status: 500 });
     }
   },
-};
+};
\ No newline at end of file