diff --git a/src/app/[article]/[year]/[slug]/page.tsx b/src/app/[article]/[year]/[slug]/page.tsx
index f29ce2a..283752a 100644
--- a/src/app/[article]/[year]/[slug]/page.tsx
+++ b/src/app/[article]/[year]/[slug]/page.tsx
@@ -46,7 +46,7 @@ export default async function ArticlePage({ params }: PageProps) {
   const articleYear = article.year;
 
   if (articleYear !== year) {
-    redirect(`/articles/${articleYear}/${article.slug}`);
+    redirect(URLS.ARTICLES(articleYear, article.slug));
   }
 
   return (
diff --git a/src/app/[article]/category/[category]/page.tsx b/src/app/[article]/category/[category]/page.tsx
index 60e6824..d167c25 100644
--- a/src/app/[article]/category/[category]/page.tsx
+++ b/src/app/[article]/category/[category]/page.tsx
@@ -76,8 +76,8 @@ export default async function CategoryArticlePage({ params }: PageProps) {
         {category} {articleLabel}
       </h3>
       <div className="list-container">
-        {filteredArticles.map((article, index) => (
-          <ArticleSummaryCard key={index} article={article} />
+        {filteredArticles.map((article) => (
+          <ArticleSummaryCard key={article.slug} article={article} />
         ))}
       </div>
     </div>
diff --git a/src/app/[article]/tag/[tag]/page.tsx b/src/app/[article]/tag/[tag]/page.tsx
index ad4b52c..3aee97d 100644
--- a/src/app/[article]/tag/[tag]/page.tsx
+++ b/src/app/[article]/tag/[tag]/page.tsx
@@ -76,8 +76,8 @@ export default async function TagArticlePage({ params }: PageProps) {
         </h3>
       </div>
       <div className="list-container">
-        {filteredArticles.map((article, index) => (
-          <ArticleSummaryCard key={index} article={article} />
+        {filteredArticles.map((article) => (
+          <ArticleSummaryCard key={article.slug} article={article} />
         ))}
       </div>
     </div>
diff --git a/src/app/education/page.tsx b/src/app/education/page.tsx
index 1e84c68..eaaf05d 100644
--- a/src/app/education/page.tsx
+++ b/src/app/education/page.tsx
@@ -40,8 +40,8 @@ export default function EducationPage() {
       </Breadcrumb>
       <h3>Education</h3>
       <div className="grid grid-cols-1 gap-8">
-        {education.map((edu, index) => (
-          <EducationSummaryCard key={index} education={edu} />
+        {education.map((edu) => (
+          <EducationSummaryCard key={edu.slug} education={edu} />
         ))}
       </div>
     </div>
diff --git a/src/app/projects/[slug]/page.tsx b/src/app/projects/[slug]/page.tsx
index cf88024..38ff6c8 100644
--- a/src/app/projects/[slug]/page.tsx
+++ b/src/app/projects/[slug]/page.tsx
@@ -67,9 +67,9 @@ export default async function ProjectPage({ params }: PageProps) {
         subtitle={project.description}
       />
       <div className="flex flex-wrap gap-2">
-        {project.stack.map((tag, index) => (
+        {project.stack.map((tag) => (
           <TagButton
-            key={index}
+            key={tag}
             tag={tag}
             source="projects"
             asLink
@@ -137,7 +137,7 @@ export async function generateMetadata({
     title: `${project.title}`,
     description: project.description,
     url: URLS.PROJECTS(project.slug),
-    image: project.ogImage,
+    image: project.ogImage || project.image,
   });
 
   return metadata;
diff --git a/src/app/projects/page.tsx b/src/app/projects/page.tsx
index 6975c22..9e17949 100644
--- a/src/app/projects/page.tsx
+++ b/src/app/projects/page.tsx
@@ -41,8 +41,8 @@ export default function ProjectsPage() {
       </Breadcrumb>
       <h3>Projects</h3>
       <div className="grid grid-cols-1 md:grid-cols-2 gap-8">
-        {projects.map((project, index) => (
-          <ProjectSummaryCard key={index} project={project} />
+        {projects.map((project) => (
+          <ProjectSummaryCard key={project.slug} project={project} />
         ))}
       </div>
     </div>
diff --git a/src/app/projects/stack/[tag]/page.tsx b/src/app/projects/stack/[tag]/page.tsx
index ebf97f8..20a9900 100644
--- a/src/app/projects/stack/[tag]/page.tsx
+++ b/src/app/projects/stack/[tag]/page.tsx
@@ -91,8 +91,8 @@ export default async function TagProjectsPage({ params }: PageProps) {
         <h3>{tag} projects</h3>
       </div>
       <div className="grid grid-cols-1 md:grid-cols-2 gap-8">
-        {filteredProjects.map((project, index) => (
-          <ProjectSummaryCard key={index} project={project} />
+        {filteredProjects.map((project) => (
+          <ProjectSummaryCard key={project.slug} project={project} />
         ))}
       </div>
     </div>
diff --git a/src/app/work/page.tsx b/src/app/work/page.tsx
index 9efc6c5..c1fd2b0 100644
--- a/src/app/work/page.tsx
+++ b/src/app/work/page.tsx
@@ -41,8 +41,8 @@ export default function WorkPage() {
       </Breadcrumb>
       <h3>Work Experience</h3>
       <div className="grid grid-cols-1 gap-8">
-        {work.map((experience, index) => (
-          <WorkSummaryCard key={index} experience={experience} />
+        {work.map((experience) => (
+          <WorkSummaryCard key={experience.slug} experience={experience} />
         ))}
       </div>
     </div>
diff --git a/src/components/helpers/structured-data.ts b/src/components/helpers/structured-data.ts
index c8c10fa..a75ecab 100644
--- a/src/components/helpers/structured-data.ts
+++ b/src/components/helpers/structured-data.ts
@@ -77,7 +77,7 @@ export function generateArticleSchema(article: Article) {
         url: configData.seo.image,
       },
     },
-    url: URLS.ARTICLES(year, article.slug),
+    url: `${BASE_URL}${URLS.ARTICLES(year, article.slug)}`,
     wordCount: article.content?.split(" ").length || 0,
     timeRequired: `PT${Math.max(1, Math.ceil((article.content?.split(" ").length || 0) / 200))}M`,
     keywords: article.tags.join(", "),
@@ -113,7 +113,7 @@ export function generateCommunitySchema(
       name: PROFILE_NAME,
       url: BASE_URL,
     },
-    url: URLS.COMMUNITY(year, community.slug),
+    url: `${BASE_URL}${URLS.COMMUNITY(year, community.slug)}`,
     eventStatus: "https://schema.org/EventScheduled",
     eventAttendanceMode: "https://schema.org/OfflineEventAttendanceMode",
     about: community.description,
@@ -149,7 +149,7 @@ export function generateProjectSchema(project: Project) {
     "@type": "SoftwareApplication",
     name: project.title,
     description: project.description,
-    url: project.url || URLS.PROJECTS(project.slug),
+    url: project.url || `${BASE_URL}${URLS.PROJECTS(project.slug)}`,
     image: project.image,
     author: {
       "@type": "Person",
diff --git a/src/components/helpers/work.tsx b/src/components/helpers/work.tsx
index 49b5dcf..750f834 100644
--- a/src/components/helpers/work.tsx
+++ b/src/components/helpers/work.tsx
@@ -172,7 +172,7 @@ export function getWorkBySlugRaw(
   if (!match) return null;
 
   const raw = fs.readFileSync(match, "utf-8");
-  const { data } = matter(raw);
+  const { data, content } = matter(raw);
   const parsed = WorkExperienceSchema.safeParse(data);
 
   if (!parsed.success) return null;
@@ -193,7 +193,7 @@ export function getWorkBySlugRaw(
       }),
   };
 
-  return { meta, raw };
+  return { meta, raw: content };
 }
 
 export function getWorkBySlugContent(