diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index f0bf8694fd..12d5cb577e 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -1001,7 +1001,11 @@ class baseRouter
 
         $this->sessionID = isset($ztSessionHandler) ? $ztSessionHandler->getSessionID() : session_id();
 
-        if(isset($_GET[$this->config->sessionVar])) helper::restartSession($_GET[$this->config->sessionVar]);
+        if(isset($_GET[$this->config->sessionVar]))
+        {
+            helper::restartSession($_GET[$this->config->sessionVar]);
+            $this->sessionID = isset($ztSessionHandler) ? $ztSessionHandler->getSessionID() : session_id();
+        }
 
         define('SESSION_STARTED', true);
     }
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index acdde12780..fcf3cc95ac 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -257,6 +257,7 @@ if($isCustomExport)
     {
         $field                    = trim($field);
         $exportFieldPairs[$field] = isset($moduleLang->$field) ? $moduleLang->$field : (isset($lang->$field) ? $lang->$field : $field);
+        if(!is_string($exportFieldPairs[$field])) $exportFieldPairs[$field] = $field;
         if(!$hasDefaultField)$selectedFields[] = $field;
     }
     js::set('defaultExportFields', join(',', $selectedFields));
diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php
index b3f719cca6..ff83b89509 100644
--- a/module/file/view/printfiles.html.php
+++ b/module/file/view/printfiles.html.php
@@ -36,6 +36,10 @@
       }
       else
       {
+          url = url.replace('?onlybody=yes&', '?');
+          url = url.replace('?onlybody=yes', '?');
+          url = url.replace('&onlybody=yes', '');
+
           window.open(url, '_blank');
       }
       return false;