diff --git a/Frontend-Learner/pages/browse/discovery.vue b/Frontend-Learner/pages/browse/discovery.vue
index 4944166b..8f4ea45c 100644
--- a/Frontend-Learner/pages/browse/discovery.vue
+++ b/Frontend-Learner/pages/browse/discovery.vue
@@ -71,12 +71,7 @@ const loadCourses = async () => {
   isLoading.value = true;
   const res = await fetchCourses();
   if (res.success) {
-    courses.value = (res.data || []).map((c: any) => ({
-      ...c,
-      rating: "0.0",
-      lessons: "0",
-      levelType: c.levelType || "neutral"
-    }));
+    courses.value = res.data || [];
   }
   isLoading.value = false;
 };
@@ -361,13 +356,13 @@ onMounted(() => {
                    <span>{{ $t('course.certificate') }}</span>
                    <span class="font-bold text-slate-900 dark:text-white">{{ selectedCourse.have_certificate ? 'มีใบประกาศฯ' : 'ไม่มี' }}</span>
                </div>
-               <div class="flex justify-between text-slate-600 dark:text-slate-400">
+               <div v-if="selectedCourse.instructor_name" class="flex justify-between text-slate-600 dark:text-slate-400">
                    <span>ผู้สอน</span>
-                   <span class="font-bold text-slate-900 dark:text-white">Professional Instructor</span>
+                   <span class="font-bold text-slate-900 dark:text-white">{{ selectedCourse.instructor_name }}</span>
                </div>
-               <div class="flex justify-between text-slate-600 dark:text-slate-400">
+               <div v-if="selectedCourse.level" class="flex justify-between text-slate-600 dark:text-slate-400">
                    <span>ระดับ</span>
-                   <span class="font-bold text-slate-900 dark:text-white">ทุกระดับ</span>
+                   <span class="font-bold text-slate-900 dark:text-white">{{ selectedCourse.level }}</span>
                </div>
             </div>
           </div>