diff --git a/classes/table/delayed_courses_table.php b/classes/table/delayed_courses_table.php
index cf467b42aae45ddbbffd3bb9f6752ec9ac1489a5..f839f64cd2c4b57aac632132e3deefd9e5459322 100644
--- a/classes/table/delayed_courses_table.php
+++ b/classes/table/delayed_courses_table.php
@@ -47,6 +47,9 @@ class delayed_courses_table extends \table_sql {
     public function __construct($filterdata) {
         parent::__construct('tool_lifecycle-delayed-courses');
 
+        global $DB;
+        $DB->set_debug(true);
+
         $fields = 'c.id as courseid, c.fullname as coursefullname, cat.name as category, ';
 
         $selectseperatedelays = true;
@@ -117,7 +120,18 @@ class delayed_courses_table extends \table_sql {
             $from .= 'JOIN {course_categories} cat ON c.category = cat.id';
         }
 
-        $where = 'true';
+        $where = 'true ';
+
+        if ($filterdata && $filterdata->category) {
+            $where .= 'AND cat.id = :catid ';
+            $params['catid'] = $filterdata->category;
+        }
+
+        if ($filterdata && $filterdata->coursename) {
+            global $DB;
+            $where .= 'AND c.fullname LIKE \'%' . $DB->sql_like_escape($filterdata->coursename) . '%\' ';
+            $params['cname'] = $filterdata->coursename;
+        }
 
         $this->set_sql($fields, $from, $where, $params);
         $this->column_nosort = ['workflow', 'tools'];