diff --git a/main/auth/courses.php b/main/auth/courses.php
index 6ed4cbf6a4..1206699dcc 100755
--- a/main/auth/courses.php
+++ b/main/auth/courses.php
@@ -156,6 +156,9 @@ switch ($action) {
             $jqueryReadyContent = $returnParams['jquery_ready_content'];
         }
 
+        $conditions = [];
+        $fields = [];
+
         if ('display_random_courses' === $action) {
             // Random value is used instead limit filter
             $courses = CoursesAndSessionsCatalog::getCoursesInCategory(null, 12);
@@ -175,16 +178,10 @@ switch ($action) {
                             $tag
                         );
                     }
-                    $form->setDefaults(
-                        [
-                            'extra_tags' => $tags,
-                        ]
-                    );
+                    $form->setDefaults(['extra_tags' => $tags,]);
                 }
             }
 
-            $conditions = [];
-            $fields = [];
             if ($allowExtraFields) {
                 // Parse params.
                 foreach ($values as $key => $value) {
diff --git a/main/inc/lib/CoursesAndSessionsCatalog.class.php b/main/inc/lib/CoursesAndSessionsCatalog.class.php
index 998a264778..e4197fc6a9 100644
--- a/main/inc/lib/CoursesAndSessionsCatalog.class.php
+++ b/main/inc/lib/CoursesAndSessionsCatalog.class.php
@@ -484,6 +484,7 @@ class CoursesAndSessionsCatalog
                        ";
             }
         }
+
         $result = Database::query($sql);
         $courses = [];
         while ($row = Database::fetch_array($result)) {