diff --git a/index.php b/index.php
index c8fb3d0..9018d98 100644
--- a/index.php
+++ b/index.php
@@ -569,7 +569,7 @@ Router\notfound(function() {
         'nb_unread_items' => $nb_items,
         'offset' => $offset,
         'items_per_page' => Model\get_config_value('items_per_page'),
-        'title' => 'miniflux ('.$nb_items.')',
+        'title' => 'Miniflux ('.$nb_items.')',
         'menu' => 'unread'
     )));
 });
diff --git a/model.php b/model.php
index 4001f4f..1b8677e 100644
--- a/model.php
+++ b/model.php
@@ -378,7 +378,7 @@ function get_unread_items($offset = null, $limit = null)
 {
     return \PicoTools\singleton('db')
         ->table('items')
-        ->columns('items.id', 'items.title', 'items.updated', 'items.url', 'items.content', 'items.bookmark', 'items.status', 'feeds.site_url', 'feeds.title AS feed_title')
+        ->columns('items.id', 'items.title', 'items.updated', 'items.url', 'items.content', 'items.bookmark', 'items.status', 'items.feed_id', 'feeds.site_url', 'feeds.title AS feed_title')
         ->join('feeds', 'id', 'feed_id')
         ->eq('status', 'unread')
         ->desc('updated')
@@ -401,7 +401,7 @@ function get_read_items($offset = null, $limit = null)
 {
     return \PicoTools\singleton('db')
         ->table('items')
-        ->columns('items.id', 'items.title', 'items.updated', 'items.url', 'items.bookmark', 'feeds.site_url', 'feeds.title AS feed_title')
+        ->columns('items.id', 'items.title', 'items.updated', 'items.url', 'items.bookmark', 'items.feed_id', 'feeds.site_url', 'feeds.title AS feed_title')
         ->join('feeds', 'id', 'feed_id')
         ->eq('status', 'read')
         ->desc('updated')
@@ -425,7 +425,7 @@ function get_bookmarks($offset = null, $limit = null)
 {
     return \PicoTools\singleton('db')
         ->table('items')
-        ->columns('items.id', 'items.title', 'items.updated', 'items.url', 'items.status', 'feeds.site_url', 'feeds.title AS feed_title')
+        ->columns('items.id', 'items.title', 'items.updated', 'items.url', 'items.status', 'items.feed_id', 'feeds.site_url', 'feeds.title AS feed_title')
         ->join('feeds', 'id', 'feed_id')
         ->in('status', array('read', 'unread'))
         ->eq('bookmark', 1)
@@ -450,7 +450,7 @@ function get_feed_items($feed_id, $offset = null, $limit = null)
 {
     return \PicoTools\singleton('db')
         ->table('items')
-        ->columns('items.id', 'items.title', 'items.updated', 'items.url', 'items.status', 'items.bookmark', 'feeds.site_url')
+        ->columns('items.id', 'items.title', 'items.updated', 'items.url', 'items.feed_id', 'items.status', 'items.bookmark', 'feeds.site_url')
         ->join('feeds', 'id', 'feed_id')
         ->in('status', array('read', 'unread'))
         ->eq('feed_id', $feed_id)
diff --git a/templates/bookmarks.php b/templates/bookmarks.php
index 393ed9e..803607e 100644
--- a/templates/bookmarks.php
+++ b/templates/bookmarks.php
@@ -21,7 +21,7 @@
                 </a>
             </h2>
             <p>
-                <?= Helper\escape($item['feed_title']) ?> |
+                <a href="?action=feed-items&amp;feed_id=<?= $item['feed_id'] ?>"><?= Helper\escape($item['feed_title']) ?></a> |
                 <?= dt('%e %B %Y %k:%M', $item['updated']) ?> |
 
                 <span class="hide-mobile">
diff --git a/templates/history.php b/templates/history.php
index 448f817..a4d160c 100644
--- a/templates/history.php
+++ b/templates/history.php
@@ -23,7 +23,7 @@
                 </a>
             </h2>
             <p>
-                <?= Helper\escape($item['feed_title']) ?> |
+                <a href="?action=feed-items&amp;feed_id=<?= $item['feed_id'] ?>"><?= Helper\escape($item['feed_title']) ?></a> |
 
                 <span class="hide-mobile"><?= dt('%e %B %Y %k:%M', $item['updated']) ?> |</span>
 
diff --git a/templates/unread_items.php b/templates/unread_items.php
index 1858b74..64d31e0 100644
--- a/templates/unread_items.php
+++ b/templates/unread_items.php
@@ -32,7 +32,7 @@
                 <?= Helper\escape(Helper\summary(strip_tags($item['content']), 50, 300)) ?>
             </p>
             <p>
-                <?= Helper\escape($item['feed_title']) ?> |
+                <a href="?action=feed-items&amp;feed_id=<?= $item['feed_id'] ?>"><?= Helper\escape($item['feed_title']) ?></a> |
                 <span class="hide-mobile"><?= dt('%e %B %Y %k:%M', $item['updated']) ?> |</span>
 
                 <span class="hide-mobile">