diff --git a/core/modules/filter/filter.admin.js b/core/modules/filter/filter.admin.js
index 8665d2d..3974faf 100644
--- a/core/modules/filter/filter.admin.js
+++ b/core/modules/filter/filter.admin.js
@@ -21,10 +21,10 @@
       $context.find('#filters-status-wrapper input.form-checkbox').once('filter-status').each(function () {
         var $checkbox = $(this);
         // Retrieve the tabledrag row belonging to this filter.
-            $row = $context.find('#' + $checkbox.attr('id').replace(/-status$/, '-weight')).closest('tr'),
+        var $row = $context.find('#' + $checkbox.attr('id').replace(/-status$/, '-weight')).closest('tr'),
         // Retrieve the vertical tab belonging to this filter.
-            $filterSettings = $context.find('#' + $checkbox.attr('id').replace(/-status$/, '-settings')),
-            filterSettingsTab = $filterSettings.data('verticalTab');
+        var $filterSettings = $context.find('#' + $checkbox.attr('id').replace(/-status$/, '-settings')),
+        var filterSettingsTab = $filterSettings.data('verticalTab');
 
         // Bind click handler to this checkbox to conditionally show and hide
         // the filter's tableDrag row and vertical tab pane.
diff --git a/core/modules/filter/filter.js b/core/modules/filter/filter.js
index 4be429c..13933c5 100644
--- a/core/modules/filter/filter.js
+++ b/core/modules/filter/filter.js
@@ -20,13 +20,13 @@
 
       function updateFilterGuidelines(event) {
         var $this = $(event.target),
-            value = $this.val();
+        var value = $this.val();
         $this.closest('.filter-wrapper')
           .find('.filter-guidelines-item').hide()
           .filter('.filter-guidelines-' + value).show();
       }
 
-      $('.filter-guidelines').once('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)