diff --git a/Contents/Code/__init__.py b/Contents/Code/__init__.py
index f2429ed..d88272e 100644
--- a/Contents/Code/__init__.py
+++ b/Contents/Code/__init__.py
@@ -18,6 +18,7 @@
 #
 
 import time
+import itertools
 
 NAME = 'Tvplexend'
 CACHE_TIME = 60
@@ -92,9 +93,17 @@ def update(self, metadata, media, lang):
 
         title = recording['disp_title']
 
+        if Prefs['includeSubtitleInTitle']:
+            subTitle = recording['disp_subtitle']
+            if len(subTitle) > 0:
+                title = '%s ★ %s' % (title, subTitle)
+
         if Prefs['includeDatetimeInTitle']:
             title = '%s (%s %s)' % (title, day, start)
 
+        if 'directory' in recording:
+            metadata.collections.add(recording['directory'])
+
         metadata.title = title
         metadata.originally_available_at = startDateTime.date()
         metadata.summary = '%s ★ %s ★ %s - %s ★ %s' % (
@@ -123,6 +132,11 @@ def ServerInfo():
     @staticmethod
     def Recordings():
         entries = Tvheadend.fetch('/api/dvr/entry/grid_finished')['entries']
+        upcoming = Tvheadend.fetch('/api/dvr/entry/grid_upcoming')['entries']
+        for upc in upcoming:
+            if 'filename' in upc:
+                entries.append(upc)
+
         return dict((entry['filename'], entry) for entry in entries)
 
     @staticmethod
diff --git a/Contents/DefaultPrefs.json b/Contents/DefaultPrefs.json
index 046d968..1fdc89a 100644
--- a/Contents/DefaultPrefs.json
+++ b/Contents/DefaultPrefs.json
@@ -23,5 +23,11 @@
         "label":    "Include date and time of recording in title",
         "type":     "bool",
         "default":  "false"
+    },
+    {
+        "id":       "includeSubtitleInTitle",
+        "label":    "Include the subtitle in title",
+        "type":     "bool",
+        "default":  "false"
     }
 ]