diff --git a/core/modules/filter/filter.admin.es6.js b/core/modules/filter/filter.admin.es6.js
index 7c69fe07c4..3676ff8fb3 100644
--- a/core/modules/filter/filter.admin.es6.js
+++ b/core/modules/filter/filter.admin.es6.js
@@ -26,7 +26,7 @@
         // Bind click handler to this checkbox to conditionally show and hide
         // the filter's tableDrag row and vertical tab pane.
         $checkbox.on('click.filterUpdate', () => {
-          if ($checkbox.is(':checked')) {
+          if ($checkbox.prop('checked')) {
             $row.show();
             if (filterSettingsTab) {
               filterSettingsTab.tabShow().updateSummary();
@@ -52,7 +52,7 @@
 
         // Attach summary for configurable filters (only for screen readers).
         if (filterSettingsTab) {
-          filterSettingsTab.details.drupalSetSummary(() => ($checkbox.is(':checked') ? Drupal.t('Enabled') : Drupal.t('Disabled')));
+          filterSettingsTab.details.drupalSetSummary(() => ($checkbox.prop('checked') ? Drupal.t('Enabled') : Drupal.t('Disabled')));
         }
 
         // Trigger our bound click handler to update elements to initial state.
diff --git a/core/modules/filter/filter.admin.js b/core/modules/filter/filter.admin.js
index 68167622fe..abb9d173df 100644
--- a/core/modules/filter/filter.admin.js
+++ b/core/modules/filter/filter.admin.js
@@ -18,7 +18,7 @@
         var filterSettingsTab = $filterSettings.data('verticalTab');
 
         $checkbox.on('click.filterUpdate', function () {
-          if ($checkbox.is(':checked')) {
+          if ($checkbox.prop('checked')) {
             $row.show();
             if (filterSettingsTab) {
               filterSettingsTab.tabShow().updateSummary();
@@ -39,7 +39,7 @@
 
         if (filterSettingsTab) {
           filterSettingsTab.details.drupalSetSummary(function () {
-            return $checkbox.is(':checked') ? Drupal.t('Enabled') : Drupal.t('Disabled');
+            return $checkbox.prop('checked') ? Drupal.t('Enabled') : Drupal.t('Disabled');
           });
         }
 
diff --git a/core/modules/filter/filter.es6.js b/core/modules/filter/filter.es6.js
index e9550dd291..4a0d53bf84 100644
--- a/core/modules/filter/filter.es6.js
+++ b/core/modules/filter/filter.es6.js
@@ -25,10 +25,9 @@
           .show();
       }
 
-      $(context)
-        .find('.filter-guidelines')
-        .once('filter-guidelines')
-        .find(':header')
+      $('.filter-guidelines', context)
+        .once('filterGuidelines')
+        .find('h1, h2, h3, h4, h5, h6')
         .hide()
         .closest('.filter-wrapper')
         .find('select.filter-list')
diff --git a/core/modules/filter/filter.js b/core/modules/filter/filter.js
index 596fc95037..46803574e2 100644
--- a/core/modules/filter/filter.js
+++ b/core/modules/filter/filter.js
@@ -14,7 +14,7 @@
         $this.closest('.filter-wrapper').find('.filter-guidelines-item').hide().filter('.filter-guidelines-' + value).show();
       }
 
-      $(context).find('.filter-guidelines').once('filter-guidelines').find(':header').hide().closest('.filter-wrapper').find('select.filter-list').on('change.filterGuidelines', updateFilterGuidelines).trigger('change.filterGuidelines');
+      $('.filter-guidelines', context).once('filterGuidelines').find('h1, h2, h3, h4, h5, h6').hide().closest('.filter-wrapper').find('select.filter-list').on('change.filterGuidelines', updateFilterGuidelines).trigger('change.filterGuidelines');
     }
   };
 })(jQuery, Drupal);
\ No newline at end of file