diff --git a/bazarr/get_providers.py b/bazarr/get_providers.py
index e792424af..a85bca7d9 100644
--- a/bazarr/get_providers.py
+++ b/bazarr/get_providers.py
@@ -204,9 +204,14 @@ def throttled_count(name):
 def update_throttled_provider():
     changed = False
     if settings.general.enabled_providers:
-        for provider in settings.general.enabled_providers.lower().split(','):
+        for provider in list(tp):
+            if provider not in settings.general.enabled_providers:
+                del tp[provider]
+                settings.general.throtteled_providers = str(tp)
+                changed = True
+
             reason, until, throttle_desc = tp.get(provider, (None, None, None))
-            
+
             if reason:
                 now = datetime.datetime.now()
                 if now < until:
diff --git a/views/episodes.tpl b/views/episodes.tpl
index 7e7113268..b18b2c3a2 100644
--- a/views/episodes.tpl
+++ b/views/episodes.tpl
@@ -222,7 +222,7 @@
 										<td>
 										%if episode['subtitles'] is not None:
 										%	actual_languages = ast.literal_eval(episode['subtitles'])
-                                        %   actual_languages.sort()
+										%   actual_languages = sorted(actual_languages, key=lambda x: (x is None, x))
 										%else:
 										%	actual_languages = '[]'
 										%end
diff --git a/views/movie.tpl b/views/movie.tpl
index 71ab63014..21038aa81 100644
--- a/views/movie.tpl
+++ b/views/movie.tpl
@@ -171,7 +171,7 @@
 						<tbody>
 							<%
 							subtitles_files = ast.literal_eval(str(details['subtitles']))
-							subtitles_files.sort(key = lambda x: x[0])
+							subtitles_files = sorted(subtitles_files, key=lambda x: (x is None, x))
 							if subtitles_files is not None:
 								for subtitles_file in subtitles_files:
 									if subtitles_file[0].endswith(':forced'):