diff --git a/_includes/components/sections/cv-education.njk b/_includes/components/sections/cv-education.njk
index 052fb21..da3e278 100644
--- a/_includes/components/sections/cv-education.njk
+++ b/_includes/components/sections/cv-education.njk
@@ -15,7 +15,7 @@
   {% if hasEducation %}
   <div class="space-y-3 mb-6">
     {% for item in cv.education %}
-    {% if not filterType or item.educationType == filterType or (filterType == "personal" and not item.educationType) %}
+    {% if not filterType or item.educationType == filterType or not item.educationType %}
     <div class="p-4 bg-white dark:bg-surface-800 rounded-lg border border-surface-200 dark:border-surface-700">
       <h3 class="font-semibold text-surface-900 dark:text-surface-100">{{ item.degree }}</h3>
       <p class="text-sm text-surface-600 dark:text-surface-400">
diff --git a/_includes/components/sections/cv-experience.njk b/_includes/components/sections/cv-experience.njk
index 9d7bf3d..ece0cf7 100644
--- a/_includes/components/sections/cv-experience.njk
+++ b/_includes/components/sections/cv-experience.njk
@@ -15,7 +15,7 @@
 
   <div class="space-y-4">
     {% for item in cv.experience | head(maxItems) %}
-    {% if not filterType or item.experienceType == filterType or (filterType == "personal" and not item.experienceType) %}
+    {% if not filterType or item.experienceType == filterType or not item.experienceType %}
     <div class="relative pl-6 border-l-2 border-primary-300 dark:border-primary-700">
       <div class="absolute -left-[7px] top-1 w-3 h-3 rounded-full bg-primary-500"></div>
       <h3 class="font-semibold text-surface-900 dark:text-surface-100">{{ item.title }}</h3>
diff --git a/_includes/components/sections/cv-interests.njk b/_includes/components/sections/cv-interests.njk
index 459e737..84467e5 100644
--- a/_includes/components/sections/cv-interests.njk
+++ b/_includes/components/sections/cv-interests.njk
@@ -11,7 +11,7 @@
 
   <div class="flex flex-wrap gap-2">
     {% for interest in cv.interests %}
-    {% if not filterType or (cv.interestTypes and cv.interestTypes[interest] == filterType) or (filterType == "personal" and (not cv.interestTypes or not cv.interestTypes[interest])) %}
+    {% if not filterType or (cv.interestTypes and cv.interestTypes[interest] == filterType) or not cv.interestTypes or not cv.interestTypes[interest] %}
     <span class="px-3 py-1.5 bg-white dark:bg-surface-800 border border-surface-200 dark:border-surface-700 rounded-full text-sm text-surface-700 dark:text-surface-300 hover:border-primary-400 dark:hover:border-primary-600 transition-colors">
       {{ interest }}
     </span>
diff --git a/_includes/components/sections/cv-skills.njk b/_includes/components/sections/cv-skills.njk
index 49712c7..50e1d13 100644
--- a/_includes/components/sections/cv-skills.njk
+++ b/_includes/components/sections/cv-skills.njk
@@ -11,7 +11,7 @@
 
   <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
     {% for category, items in cv.skills | dictsort %}
-    {% if not filterType or (cv.skillTypes and cv.skillTypes[category] == filterType) or (filterType == "personal" and (not cv.skillTypes or not cv.skillTypes[category])) %}
+    {% if not filterType or (cv.skillTypes and cv.skillTypes[category] == filterType) or not cv.skillTypes or not cv.skillTypes[category] %}
     <div class="p-4 bg-white dark:bg-surface-800 rounded-lg border border-surface-200 dark:border-surface-700">
       <h3 class="font-semibold text-sm uppercase tracking-wide text-surface-600 dark:text-surface-400 mb-2">
         {{ category }}
diff --git a/cv.njk b/cv.njk
index 67065e0..2c4f7fb 100644
--- a/cv.njk
+++ b/cv.njk
@@ -10,7 +10,7 @@ pagefindIgnore: true
 
 {% set hasCvData = (cv.experience and cv.experience.length) or
       (cv.projects and cv.projects.length) or
-      (cv.skills and (cv.skills | dictsort | length)) %}
+      (cv.skills and ((cv.skills or {}) | dictsort | length)) %}
 
 {% if hasCvData %}