diff --git a/src/Controller/BundleController.php b/src/Controller/BundleController.php
index fc7715b..cd2a2f0 100644
--- a/src/Controller/BundleController.php
+++ b/src/Controller/BundleController.php
@@ -52,8 +52,8 @@ class BundleController extends ControllerBase {
     $file = $this->bundler->bundle($webform_submission);
     if (file_exists($file)) {
       header('Content-Description: File Transfer');
-      header('Content-Type: application/octet-stream');
-      header('Content-Disposition: attachment; filename=' . basename($file));
+      header('Content-Type: application/pdf');
+      header('Content-Disposition: inline; filename=' . basename($file));
       header('Expires: 0');
       header('Cache-Control: must-revalidate');
       header('Pragma: public');
diff --git a/src/SubmissionBundler.php b/src/SubmissionBundler.php
index ff524df..ac52020 100644
--- a/src/SubmissionBundler.php
+++ b/src/SubmissionBundler.php
@@ -90,7 +90,7 @@ class SubmissionBundler {
       $file_ids = array_merge($file_ids, $this->submissionPdfFinder->getFileIds($upload_submission));
     }
     $uris = array_merge($uris, $this->fileUris($file_ids));
-    $outputFilename = $webFormSubmission->getWebForm()->id() . '-' . $webFormSubmission->id() . '-' . $webFormSubmission->getData('email') . '.pdf';
+    $outputFilename = $webFormSubmission->getWebForm()->id() . '-' . $webFormSubmission->id() . '.pdf';
     $outputUri = 'temporary://' . $outputFilename;
     $this->concatenatePdfs($uris, $outputUri);
 
diff --git a/src/WebFormSubmissionListBuilderOverride.php b/src/WebFormSubmissionListBuilderOverride.php
index 1764938..67521ca 100644
--- a/src/WebFormSubmissionListBuilderOverride.php
+++ b/src/WebFormSubmissionListBuilderOverride.php
@@ -91,12 +91,11 @@ class WebFormSubmissionListBuilderOverride extends WebformSubmissionListBuilder
     $operations = parent::getDefaultOperations($entity);
     $base_route_name = $this->requestHandler->getBaseRouteName($entity, $this->sourceEntity);
     $route_parameters = $this->requestHandler->getRouteParameters($entity, $this->sourceEntity);
-    $route_options = ['query' => \Drupal::destination()->getAsArray()];
     if ($entity->access('view')) {
       $operations['bundle'] = [
         'title' => $this->t('Bundle'),
         'weight' => -10,
-        'url' => Url::fromRoute("$base_route_name.webform_submission.bundle", $route_parameters, $route_options),
+        'url' => Url::fromRoute("$base_route_name.webform_submission.bundle", $route_parameters),
       ];
     }
     return $operations;