diff --git a/includes/pager.inc b/includes/pager.inc
index 62e8278..5e52b77 100644
--- a/includes/pager.inc
+++ b/includes/pager.inc
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 
 /**
  * Returns the current page being requested for display within a pager.
@@ -147,7 +148,10 @@ function pager_default_initialize($total, $limit, $element = 0) {
 function pager_get_query_parameters() {
   $query = &drupal_static(__FUNCTION__);
   if (!isset($query)) {
-    $query = UrlHelper::filterQueryParameters(\Drupal::request()->query->all(), ['page']);
+    $query = UrlHelper::filterQueryParameters(\Drupal::request()->query->all(), [
+      'page',
+      MainContentViewSubscriber::WRAPPER_FORMAT,
+    ]);
   }
   return $query;
 }
diff --git a/includes/tablesort.inc b/includes/tablesort.inc
index d8f1624..1b3e947 100644
--- a/includes/tablesort.inc
+++ b/includes/tablesort.inc
@@ -12,6 +12,7 @@
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Url;
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 
 /**
  * Initializes the table sort context.
@@ -80,7 +81,11 @@ function tablesort_header(&$cell_content, array &$cell_attributes, array $header
  *   page request except for those pertaining to table sorting.
  */
 function tablesort_get_query_parameters() {
-  return UrlHelper::filterQueryParameters(\Drupal::request()->query->all(), ['sort', 'order']);
+  return UrlHelper::filterQueryParameters(\Drupal::request()->query->all(), [
+    'sort',
+    'order',
+    MainContentViewSubscriber::WRAPPER_FORMAT,
+  ]);
 }
 
 /**