diff --git a/question/editlib.php b/question/editlib.php
index d6eb449b71c..2f196a064e6 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -222,11 +222,14 @@ function question_build_edit_resources($edittab, $baseurl, $params,
             if ($filterkey == 'jointype') {
                 $cleanparams['filter']['jointype'] = clean_param($filtervalue, PARAM_INT);
             } else {
+                if (!array_key_exists('name', $filtervalue)) {
+                    $filtervalue['name'] = $filterkey;
+                }
                 $cleanfilter = [
                     'name' => clean_param($filtervalue['name'], PARAM_ALPHANUM),
                     'jointype' => clean_param($filtervalue['jointype'], PARAM_INT),
                     'values' => $filtervalue['values'],
-                    'filteroptions' => $filtervalue['filteroptions'],
+                    'filteroptions' => $filtervalue['filteroptions'] ?? [],
                 ];
                 $cleanparams['filter'][$filterkey] = $cleanfilter;
             }