diff --git a/main/admin/course_export.php b/main/admin/course_export.php
index 781641cb3d..c4d368b4b7 100755
--- a/main/admin/course_export.php
+++ b/main/admin/course_export.php
@@ -54,6 +54,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
             'Code',
             'Title',
             'CourseCategory',
+            'CourseCategoryName',
             'Teacher',
             'Language',
             'Users',
@@ -61,10 +62,17 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
         ];
 
         $dataToExport = [];
+
         foreach ($courses as $course) {
             $dataToExport['code'] = str_replace(';',',',$course['code']);
             $dataToExport['title'] = str_replace(';',',',$course['title']);
             $dataToExport['category_code'] = str_replace(';',',',$course['category_code']);
+            $categoryInfo = CourseCategory::getCategory($course['category_code']);
+            if ($categoryInfo) {
+                $dataToExport['category_name'] = str_replace(';',',',$categoryInfo['name']);
+            } else {
+                $dataToExport['category_name'] = '';
+            }
             $dataToExport['tutor_name'] = str_replace(';',',',$course['tutor_name']);
             $dataToExport['course_language'] = str_replace(';',',',$course['course_language']);
 
diff --git a/main/admin/course_import.php b/main/admin/course_import.php
index a7ed55d7e4..a8975eea88 100755
--- a/main/admin/course_import.php
+++ b/main/admin/course_import.php
@@ -65,7 +65,7 @@ function validate_data($courses)
         if (isset($course['CourseCategory']) && strlen($course['CourseCategory']) != 0) {
             $categoryInfo = CourseCategory::getCategory($course['CourseCategory']);
             if (empty($categoryInfo)) {
-                CourseCategory::addNode($course['CourseCategory'], $course['CourseCategory'], 'TRUE', null);
+                CourseCategory::addNode($course['CourseCategory'], $course['CourseCategoryName'] ? $course['CourseCategoryName'] : $course['CourseCategory'], 'TRUE', null);
             }
         }
     }
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 9065a4ffd6..b17de0666e 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -286,7 +286,15 @@ class CourseManager
             $sql .= ' OFFSET 0';
         }
 
-        return Database::store_result(Database::query($sql));
+        $data = [];
+        $res = Database::query($sql);
+        if (Database::num_rows($res) > 0) {
+            while ($row = Database::fetch_array($res, 'ASSOC')) {
+                $data[] = $row;
+            }
+        }
+
+        return $data;
     }
 
     /**