diff --git a/addon.xml b/addon.xml
index fdcabe5..5fc1367 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.embycon" 
         name="EmbyCon"
-        version="1.3.20"
+        version="1.3.21"
         provider-name="Team B">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
diff --git a/resources/lib/datamanager.py b/resources/lib/datamanager.py
index a94a38b..f5f69b5 100644
--- a/resources/lib/datamanager.py
+++ b/resources/lib/datamanager.py
@@ -4,6 +4,7 @@ import hashlib
 import os
 import threading
 import json
+import encodings
 
 import xbmcaddon
 import xbmc
diff --git a/resources/lib/functions.py b/resources/lib/functions.py
index ac55087..2da3f54 100644
--- a/resources/lib/functions.py
+++ b/resources/lib/functions.py
@@ -8,6 +8,7 @@ import cProfile
 import pstats
 import json
 import StringIO
+import encodings
 
 import xbmcplugin
 import xbmcgui
@@ -844,12 +845,20 @@ def processDirectory(results, progress, params):
         extraData['mode'] = "GET_CONTENT"
 
         if isFolder == True:
-            u = ('{server}/emby/Users/{userid}/items' +
-                 '?ParentId=' + id +
-                 '&IsVirtualUnAired=false' +
-                 '&IsMissing=false&' +
-                 'Fields=' + detailsString +
-                 '&format=json')
+
+            if item.get("Type", "") == "Series":
+                u = ('{server}/emby/Shows/' + id +
+                     '/Seasons'
+                     '?userId={userid}' +
+                     '&Fields=' + detailsString +
+                     '&format=json')
+            else:
+                u = ('{server}/emby/Users/{userid}/items' +
+                     '?ParentId=' + id +
+                     '&IsVirtualUnAired=false' +
+                     '&IsMissing=false&' +
+                     'Fields=' + detailsString +
+                     '&format=json')
 
             if item.get("RecursiveItemCount") != 0:
                 dirItems.append(addGUIItem(u, details, extraData, display_options))
diff --git a/resources/lib/menu_functions.py b/resources/lib/menu_functions.py
index 19467b6..6fc0838 100644
--- a/resources/lib/menu_functions.py
+++ b/resources/lib/menu_functions.py
@@ -3,6 +3,7 @@
 import sys
 import json
 import urllib
+import encodings
 
 import xbmcplugin
 import xbmcaddon
diff --git a/resources/lib/simple_logging.py b/resources/lib/simple_logging.py
index f25bcd4..63ce6ac 100644
--- a/resources/lib/simple_logging.py
+++ b/resources/lib/simple_logging.py
@@ -1,5 +1,7 @@
 # Gnu General Public License - see LICENSE.TXT
 
+import encodings
+
 import xbmc
 import xbmcaddon
 from json_rpc import json_rpc
diff --git a/resources/lib/translation.py b/resources/lib/translation.py
index 4db8939..f0c2214 100644
--- a/resources/lib/translation.py
+++ b/resources/lib/translation.py
@@ -1,3 +1,4 @@
+import encodings
 import xbmcaddon
 from simple_logging import SimpleLogging
 
diff --git a/resources/lib/utils.py b/resources/lib/utils.py
index 6afa3bd..05a1094 100644
--- a/resources/lib/utils.py
+++ b/resources/lib/utils.py
@@ -1,7 +1,7 @@
 # Gnu General Public License - see LICENSE.TXT
 import xbmcaddon
-
 import re
+import encodings
 
 from downloadutils import DownloadUtils
 from simple_logging import SimpleLogging
diff --git a/service.py b/service.py
index 83a1da2..f3c3610 100644
--- a/service.py
+++ b/service.py
@@ -318,6 +318,7 @@ while not xbmc_monitor.abortRequested():
 
 # clear user and token when loggin off
 home_window = HomeWindow()
+home_window.clearProperty("Service_Timestamp")
 home_window.clearProperty("userid")
 home_window.clearProperty("AccessToken")
 home_window.clearProperty("Params")