diff --git a/main/auth/courses_categories.php b/main/auth/courses_categories.php
index 9fa2b4fb3d..fd3a47b68d 100755
--- a/main/auth/courses_categories.php
+++ b/main/auth/courses_categories.php
@@ -296,9 +296,10 @@ function getOptionSelect($categories, $codeType)
     $html = '';
     $html .= '<select name="category_code" onchange="submit();" class="selectpicker form-control">';
     foreach ($categories as $category) {
-        $categoryCode = $category['code'];
-        $countCourse = $category['number_courses'];
-        $level = $category['level'];
+        $categoryCode = Security::remove_XSS($category['code']);
+        $categoryName = Security::remove_XSS($category['name']);
+        $countCourse = (int) $category['number_courses'];
+        $level =  $category['level'];
         if (empty($countCourse)) {
             continue;
         }
@@ -308,7 +309,7 @@ function getOptionSelect($categories, $codeType)
             $separate = '';
         }
         $html .= '<option '.($categoryCode == $codeType ? 'selected="selected" ' : '')
-            .' value="'.$category['code'].'">'.$separate.' '.$category['name'].' ('.$countCourse.') </option>';
+            .' value="'.$categoryCode.'">'.$separate.' '.$categoryName.' ('.$countCourse.') </option>';
     }
     $html .= '</select>';
 
diff --git a/main/inc/lib/CoursesAndSessionsCatalog.class.php b/main/inc/lib/CoursesAndSessionsCatalog.class.php
index a7cd854c2c..55a31ed352 100644
--- a/main/inc/lib/CoursesAndSessionsCatalog.class.php
+++ b/main/inc/lib/CoursesAndSessionsCatalog.class.php
@@ -238,7 +238,6 @@ class CoursesAndSessionsCatalog
 
         $categoriesFromDatabase = CourseCategory::getCategories();
 
-        //$allCategories = CourseCategory::getCategoriesCanBeAddedInCourse();
         foreach ($categoriesFromDatabase as $row) {
             $count_courses = CourseCategory::countCoursesInCategory($row['code']);
             $row['count_courses'] = $count_courses;
diff --git a/main/inc/lib/course_category.lib.php b/main/inc/lib/course_category.lib.php
index c55e4560d1..29ad69d535 100755
--- a/main/inc/lib/course_category.lib.php
+++ b/main/inc/lib/course_category.lib.php
@@ -113,9 +113,10 @@ class CourseCategory
     }
 
     /**
-     * @param string $category Optional. Parent category code
-     *
-     * @return array
+     * Returns a flat list of all course categories in this URL. If the
+     * allow_base_course_category option is true, then also show the
+     * course categories of the base URL
+     * @return array [id, name, code, parent_id, tree_pos, children_count, number_courses]
      */
     public static function getAllCategories()
     {