diff --git a/public/main/admin/course_request_accepted.php b/public/main/admin/course_request_accepted.php
index e468b2317a..618bc21323 100644
--- a/public/main/admin/course_request_accepted.php
+++ b/public/main/admin/course_request_accepted.php
@@ -163,7 +163,7 @@ if (!$course_validation_feature) {
 }
 
 // Create a simple search-box.
-$form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
+$form = new FormValidator('search_simple', 'get', '', '', [], false);
 $renderer = $form->defaultRenderer();
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addElement('text', 'keyword', get_lang('Keyword'));
diff --git a/public/main/admin/course_request_rejected.php b/public/main/admin/course_request_rejected.php
index b9e91335fe..4a4981cfd5 100644
--- a/public/main/admin/course_request_rejected.php
+++ b/public/main/admin/course_request_rejected.php
@@ -216,7 +216,7 @@ if (!$course_validation_feature) {
 }
 
 // Create a simple search-box.
-$form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
+$form = new FormValidator('search_simple', 'get', '', '', [], false);
 $renderer = $form->defaultRenderer();
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addElement('text', 'keyword', get_lang('Keyword'));
diff --git a/public/main/admin/course_request_review.php b/public/main/admin/course_request_review.php
index 2631aa7df2..78489040d5 100644
--- a/public/main/admin/course_request_review.php
+++ b/public/main/admin/course_request_review.php
@@ -182,7 +182,7 @@ function get_request_data($from, $number_of_items, $column, $direction)
 function email_filter($teacher)
 {
     $teacher = Database::escape_string($teacher);
-    $sql = 'SELECT user_id FROM '.Database::get_main_table(TABLE_MAIN_COURSE_REQUEST)." 
+    $sql = 'SELECT user_id FROM '.Database::get_main_table(TABLE_MAIN_COURSE_REQUEST)."
             WHERE tutor_name LIKE '".$teacher."'";
     $res = Database::query($sql);
     $info = Database::fetch_array($res);
@@ -245,7 +245,7 @@ if (!$course_validation_feature) {
 }
 
 // Create a simple search-box.
-$form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
+$form = new FormValidator('search_simple', 'get', '', '', [], false);
 $renderer = $form->defaultRenderer();
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addElement('text', 'keyword', get_lang('Keyword'));
diff --git a/public/main/create_course/add_course.php b/public/main/create_course/add_course.php
index 5b804e7d43..dc93be70a6 100644
--- a/public/main/create_course/add_course.php
+++ b/public/main/create_course/add_course.php
@@ -306,7 +306,7 @@ if ($form->validate()) {
     $course_values = $form->exportValues();
 
     $wanted_code = $course_values['wanted_code'];
-    $category_code = isset($course_values['category_id']) ? (int) $course_values['category_id'] : '';
+    $category_code = isset($course_values['category_id']) ? (string) $course_values['category_id'] : '';
     $title = $course_values['title'];
     $course_language = $course_values['course_language'];
     $exemplary_content = !empty($course_values['exemplary_content']);
@@ -336,7 +336,7 @@ if ($form->validate()) {
             $params['title'] = $title;
             $params['exemplary_content'] = $exemplary_content;
             $params['wanted_code'] = $wanted_code;
-            $params['course_id'] = $category_code;
+            //$params['course_id'] = $category_code;
             $params['course_language'] = $course_language;
             $params['gradebook_model_id'] = isset($course_values['gradebook_model_id']) ? $course_values['gradebook_model_id'] : null;
             $params['course_template'] = isset($course_values['course_template']) ? $course_values['course_template'] : '';
diff --git a/public/main/inc/lib/course_request.lib.php b/public/main/inc/lib/course_request.lib.php
index a028f129d6..f0b1dfbc8d 100644
--- a/public/main/inc/lib/course_request.lib.php
+++ b/public/main/inc/lib/course_request.lib.php
@@ -62,11 +62,11 @@ class CourseRequestManager
         $objectives,
         $target_audience,
         $user_id,
-        $exemplary_content
+        $exemplary_content = 0
     ) {
         $wanted_code = trim($wanted_code);
         $user_id = (int) $user_id;
-        $exemplary_content = (bool) $exemplary_content ? 1 : 0;
+        $exemplary_content = (int) $exemplary_content;
 
         if ('' == $wanted_code) {
             return false;
@@ -101,20 +101,18 @@ class CourseRequestManager
         // @todo user entity
         $sql = sprintf(
             'INSERT INTO %s (
-                code, user_id, directory, db_name,
+                code, user_id,
                 course_language, title, description, category_code,
                 tutor_name, visual_code, request_date,
                 objetives, target_audience, status, info, exemplary_content)
             VALUES (
-                "%s", "%s", "%s", "%s",
+                "%s", "%d", "%s", "%s",
                 "%s", "%s", "%s", "%s",
                 "%s", "%s", "%s",
-                "%s", "%s", "%s", "%s", "%s");',
+                "%s", "%s", "%d");',
             Database::get_main_table(TABLE_MAIN_COURSE_REQUEST),
             Database::escape_string($code),
-            Database::escape_string($user_id),
-            Database::escape_string($directory),
-            Database::escape_string($db_name),
+            $user_id,
             Database::escape_string($course_language),
             Database::escape_string($title),
             Database::escape_string($description),
@@ -126,7 +124,7 @@ class CourseRequestManager
             Database::escape_string($target_audience),
             Database::escape_string($status),
             Database::escape_string($info),
-            Database::escape_string($exemplary_content)
+            $exemplary_content
         );
 
         $result_sql = Database::query($sql);
@@ -469,13 +467,18 @@ class CourseRequestManager
         $params = [];
 
         $params['title'] = $course_request_info['title'];
-        $params['course_category'] = $course_request_info['category_code'];
         $params['course_language'] = $course_request_info['course_language'];
         $params['exemplary_content'] = intval($course_request_info['exemplary_content']) > 0;
         $params['wanted_code'] = $course_request_info['code'];
         $params['user_id'] = $course_request_info['user_id'];
         $params['tutor_name'] = api_get_person_name($user_info['firstname'], $user_info['lastname']);
 
+        if (!empty($course_request_info['category_code'])) {
+            $category = CourseCategory::getCategory($course_request_info['category_code']);
+            $categoryId = (int) $category['id'];
+            $params['course_categories'] = [$categoryId];
+        }
+
         $course = CourseManager::create_course($params);
         if (null !== $course) {
             // Mark the request as accepted.