diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index 0b37305..bd61a0b 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -119,8 +119,21 @@ class Routing
             } elseif (isset($_GET['deluser'])) {
                 $this->wallabag->deleteUser($_POST['password4deletinguser']);
             } elseif (isset($_GET['epub'])) {
-                $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['id'], $_GET['value']);
-                $epub->run();
+                $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['value']);
+                $epub->prepareData();
+                $epub->produceEpub();
+            } elseif (isset($_GET['mobi'])) {
+                $mobi = new WallabagMobi($this->wallabag, $_GET['method'], $_GET['value']);
+                $mobi->prepareData();
+                $mobi->produceMobi();
+            } elseif (isset($_GET['send2kindle'])) {
+                $mobi = new WallabagMobi($this->wallabag, $_GET['method'], $_GET['value']);
+                $mobi->prepareData();
+                $mobi->produceMobi(TRUE);
+            } elseif (isset($_GET['pdf'])) {
+                $pdf = new WallabagPDF($this->wallabag, $_GET['method'], $_GET['value']);
+                $pdf->prepareData();
+                $pdf->producePDF();
             } elseif (isset($_GET['import'])) {
                 $import = $this->wallabag->import();
                 $tplVars = array_merge($this->vars, $import);