diff --git a/mod/assign/templates/grading_navigation.mustache b/mod/assign/templates/grading_navigation.mustache
index ab2d9e56005..207533e9aaa 100644
--- a/mod/assign/templates/grading_navigation.mustache
+++ b/mod/assign/templates/grading_navigation.mustache
@@ -75,7 +75,6 @@
 {{/duedate}}
 </div>
 
-</span>
 </div>
 
 {{!
@@ -97,7 +96,7 @@
 </div>
 {{#js}}
 require(['mod_assign/grading_navigation', 'core/tooltip'], function(GradingNavigation, ToolTip) {
-    var nav = new GradingNavigation('[data-region="user-selector"]');
-    var tooltip = new ToolTip('[data-region="assignment-tooltip"]');
+    new GradingNavigation('[data-region="user-selector"]');
+    new ToolTip('[data-region="assignment-tooltip"]');
 });
 {{/js}}
diff --git a/mod/assign/templates/grading_navigation_user_selector.mustache b/mod/assign/templates/grading_navigation_user_selector.mustache
index 30378ce5f17..f370b3b5c03 100644
--- a/mod/assign/templates/grading_navigation_user_selector.mustache
+++ b/mod/assign/templates/grading_navigation_user_selector.mustache
@@ -44,7 +44,7 @@
     </small>
 </span>
 
-<span data-region="configure-filters" id="filter-configuration-{{uniqid}}" class="card card-large p-2">
+<div data-region="configure-filters" id="filter-configuration-{{uniqid}}" class="card card-large p-2">
     <form>
         <span class="row px-3 py-1">
             <label class="text-right w-25 p-2 m-0" for="filter-general-{{uniqid}}">
@@ -81,7 +81,7 @@
         </span>
         {{/hasmarkingworkflow}}
     </form>
-</span>
+</div>
 
 <a href="#" data-region="user-filters" title="{{#str}}changefilters, mod_assign{{/str}}" aria-expanded="false" aria-controls="filter-configuration-{{uniqid}}">
     <span class="accesshide">