diff --git a/appinfo/info.xml b/appinfo/info.xml
index c19aa2e1..f1752d7e 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -20,7 +20,7 @@
     <navigations>
         <navigation>
             <name>Polaroid</name>
-            <route>polaroid.page.index</route>
+            <route>polaroid.page.main</route>
         </navigation>
     </navigations>
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 22c610df..ded99e85 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -1,13 +1,15 @@
 <?php
 return [
     'routes' => [
-	    ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
-        ['name' => 'page#index', 'url' => '/albums/{path}', 'verb' => 'GET', 'postfix' => 'albums',
+        ['name' => 'page#main', 'url' => '/', 'verb' => 'GET'],
+        ['name' => 'page#album', 'url' => '/albusms/{path}/{path1}', 'verb' => 'GET',
 			'requirements' => [
 				'path' => '.*',
+                'path1' => '.*',
 			],
 			'defaults' => [
 				'path' => '',
+                'path1' => '',
 			]
 	    ],
 
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 7c9af2a1..c734b028 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -29,7 +29,7 @@ class PageController extends Controller {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function index() {
+	public function main() {
 		Util::addScript($this->appName, 'polaroid-main');
 		Util::addStyle($this->appName, 'icons');
 
@@ -39,4 +39,11 @@ class PageController extends Controller {
 		return $response;
 	}
 
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function album() {
+		return $this->main();
+	}
 }
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index 9844c0c1..84e57856 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -413,6 +413,8 @@ export default {
                 try {
                     this.loading = true;
                     fileInfos = await dav.getFiles(ids);
+                } catch {
+                    console.error('Failed to load fileInfos');
                 } finally {
                     this.loading = false;
                 }
@@ -431,7 +433,7 @@ export default {
                 });
             }
 
-            const photo = fileInfos.find(d => Number(d.fileid) === Number(img.id));
+            const photo = fileInfos.find(d => Number(d.fileid) === Number(img.file_id));
             if (!photo) {
                 alert('Cannot find this photo anymore!');
                 return;