diff --git a/addon.xml b/addon.xml
index bb2320394..78cac4cfe 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.netflix" name="Netflix" version="0.11.20" provider-name="libdev + jojo + asciidisco">
+<addon id="plugin.video.netflix" name="Netflix" version="0.11.21" provider-name="libdev + jojo + asciidisco">
   <requires>
     <import addon="xbmc.python" version="2.24.0"/>
     <import addon="script.module.beautifulsoup4" version="4.3.2"/>
@@ -28,8 +28,10 @@
     <license>MIT</license>
     <forum>http://www.kodinerds.net/index.php/Thread/55607-Inputstream-Agile-Betatest-Netflix/</forum>
     <source>https://github.com/asciidisco/plugin.video.netflix</source>
-    <news>v0.11.20 (2017-08-07)
-    - Fixes issues with playback from within the Kodi library 
+    <news>v0.11.21 (2017-08-15)
+    - Fixes issues with badly encoded TV-Show titles
+    - Adds Hebrew translations
+    - Slightly improves list rendering performance  
     </news>
   </extension>
 </addon>
diff --git a/resources/language/Dutch/strings.po b/resources/language/Dutch/strings.po
index 718604891..0f49ce58c 100644
--- a/resources/language/Dutch/strings.po
+++ b/resources/language/Dutch/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 870fa237c..c8c96dea8 100644
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po
index dc4bb5568..b2e53ffc8 100644
--- a/resources/language/German/strings.po
+++ b/resources/language/German/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Hebrew/strings.po b/resources/language/Hebrew/strings.po
index a00db9ef7..4be97e191 100644
--- a/resources/language/Hebrew/strings.po
+++ b/resources/language/Hebrew/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 # Translated by: Itayshechter
 msgid ""
diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po
index 1536417a5..b73486731 100644
--- a/resources/language/Italian/strings.po
+++ b/resources/language/Italian/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Polish/strings.po b/resources/language/Polish/strings.po
index 9bc41975f..7e317e09c 100644
--- a/resources/language/Polish/strings.po
+++ b/resources/language/Polish/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Portugese/strings.po b/resources/language/Portugese/strings.po
index eeec3368d..1f1ed384c 100644
--- a/resources/language/Portugese/strings.po
+++ b/resources/language/Portugese/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Slovak/strings.po b/resources/language/Slovak/strings.po
index 4c6b87736..b8f5a8910 100644
--- a/resources/language/Slovak/strings.po
+++ b/resources/language/Slovak/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Spanish/strings.po b/resources/language/Spanish/strings.po
index 99887f31b..ecba29806 100644
--- a/resources/language/Spanish/strings.po
+++ b/resources/language/Spanish/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Swedish/strings.po b/resources/language/Swedish/strings.po
index e9c596fc9..3773d84da 100644
--- a/resources/language/Swedish/strings.po
+++ b/resources/language/Swedish/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.11.20
+# Addon version: 0.11.21
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py
index 737f97304..c8fd92588 100644
--- a/resources/lib/KodiHelper.py
+++ b/resources/lib/KodiHelper.py
@@ -7,6 +7,7 @@
 import xbmcgui
 import xbmc
 import json
+import base64
 from MSL import MSL
 from os import remove
 from os.path import join, isfile
@@ -464,7 +465,7 @@ def build_video_listing (self, video_list, actions, type, build_url):
                 isFolder = True
                 params = {'action': actions[video['type']], 'show_id': video_list_id}
                 if 'tvshowtitle' in infos:
-                    params['tvshowtitle'] = infos.get('tvshowtitle', '').encode('utf-8')
+                    params['tvshowtitle'] = base64.urlsafe_b64encode(infos.get('tvshowtitle', '').encode('utf-8'))
                 url = build_url(params)
             xbmcplugin.addDirectoryItem(handle=self.plugin_handle, url=url, listitem=li, isFolder=isFolder)
 
@@ -585,7 +586,7 @@ def build_season_listing (self, seasons_sorted, build_url):
             li = self._generate_context_menu_items(entry=season, li=li)
             params = {'action': 'episode_list', 'season_id': season['id']}
             if 'tvshowtitle' in infos:
-                params['tvshowtitle'] = infos.get('tvshowtitle', '').encode('utf-8')
+                params['tvshowtitle'] = base64.urlsafe_b64encode(infos.get('tvshowtitle', '').encode('utf-8'))
             url = build_url(params)
             xbmcplugin.addDirectoryItem(handle=self.plugin_handle, url=url, listitem=li, isFolder=True)
 
@@ -806,7 +807,7 @@ def _generate_entry_info (self, entry, li, base_info={}):
                 quality = {'width': '1920', 'height': '1080'}
             li.addStreamInfo('video', quality)
         if 'tvshowtitle' in entry_keys:
-            infos.update({'tvshowtitle': entry.get('tvshowtitle', '').encode('utf-8')})
+            infos.update({'tvshowtitle': base64.urlsafe_b64decode(entry.get('tvshowtitle', '')).decode('utf-8')})
         li.setInfo('video', infos)
         return li, infos