diff --git a/src/components/Changelog/index.astro b/src/components/Changelog/index.astro
index 2367d396..7cfe2e1c 100644
--- a/src/components/Changelog/index.astro
+++ b/src/components/Changelog/index.astro
@@ -13,7 +13,7 @@ if (!repoInfo) {
   console.info(`Repo ${repo} not found`)
   return
 }
-const { url, owner, object } = repoInfo
+const { url, object } = repoInfo
 const changelogHtml = await markdownToHtml(
   object.text.replace('### Changelog', '')
 )
@@ -27,7 +27,7 @@ const changelogHtml = await markdownToHtml(
         <p class={styles.source}>
           sourced from{' '}
           <a href={`${url}/tree/main/CHANGELOG.md`}>
-            <code>{`${owner?.login}/${repo}:CHANGELOG.md`}</code>
+            <code>{`${repo}:CHANGELOG.md`}</code>
           </a>
         </p>
         <div class={styles.content} set:html={changelogHtml} />
diff --git a/src/lib/astro/getAllPostsForSearch.ts b/src/lib/astro/getAllPostsForSearch.ts
index 496a4bee..56e68e7a 100644
--- a/src/lib/astro/getAllPostsForSearch.ts
+++ b/src/lib/astro/getAllPostsForSearch.ts
@@ -1,10 +1,10 @@
 import { type CollectionEntry } from 'astro:content'
-import { getAllPosts } from './index'
+import { getAllPosts } from './getAllPosts'
 
 // helps to reduce DOM size
 export async function getAllPostsForSearch() {
   const allPosts = await getAllPosts()
-  if (!allPosts) return
+  if (!allPosts) return []
 
   const cleaned = await Promise.all(
     allPosts.map(async (post) => {
diff --git a/src/lib/astro/getSlug.ts b/src/lib/astro/getSlug.ts
index 707797ed..b7963599 100644
--- a/src/lib/astro/getSlug.ts
+++ b/src/lib/astro/getSlug.ts
@@ -7,7 +7,7 @@ export function getSlug(filePath: string) {
 
   // construct slug as full path from either file or folder name,
   if (parsedPath.base === 'index.md') {
-    slug = `${parsedPath.dir}`
+    slug = parsedPath.dir
   } else {
     slug = `${parsedPath.dir}/${parsedPath.name}`
   }
diff --git a/src/lib/astro/loadAndFormatCollection.ts b/src/lib/astro/loadAndFormatCollection.ts
index 6b833d3d..440ecc12 100644
--- a/src/lib/astro/loadAndFormatCollection.ts
+++ b/src/lib/astro/loadAndFormatCollection.ts
@@ -32,7 +32,7 @@ export async function loadAndFormatCollection(
     //
     // construct slug from folder or file name
     //
-    const slug = getSlug(post.id)
+    const slug = getSlug(`${post.collection}/${post.id}`)
 
     const githubLink = `${config.repoContentPath}/${post.collection}/${post.id}`