diff --git a/data/interfaces/default/stream_data.html b/data/interfaces/default/stream_data.html
index bd2ffb2a..d4c81741 100644
--- a/data/interfaces/default/stream_data.html
+++ b/data/interfaces/default/stream_data.html
@@ -218,10 +218,10 @@ DOCUMENTATION :: END
                         <td>${data['stream_audio_channels']}</td>
                         <td>${data['audio_channels']}</td>
                     </tr>
-                    % if data['stream_audio_language'] != '':
+                    % if data['audio_language'] != '':
                     <tr>
                         <td>Language</td>
-                        <td>${data['stream_audio_language']}</td>
+                        <td>-</td>
                         <td>${data['audio_language']}</td>
                     </tr>
                     % endif
@@ -245,6 +245,13 @@ DOCUMENTATION :: END
                         <td>${data['stream_subtitle_codec'].upper() or '-'}</td>
                         <td>${data['subtitle_codec'].upper()}</td>
                     </tr>
+                    % if data['subtitle_language'] != '':
+                    <tr>
+                        <td>Language</td>
+                        <td>-</td>
+                        <td>${data['subtitle_language']}</td>
+                    </tr>
+                    % endif
                 </tbody>
             </table>
             % endif
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 8a15ef7d..5a77ba38 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -1286,13 +1286,14 @@ class DataFactory(object):
                     'synced_version, synced_version_profile, ' \
                     'container, video_codec, video_bitrate, video_width, video_height, video_framerate, ' \
                     'video_dynamic_range, aspect_ratio, ' \
-                    'audio_codec, audio_bitrate, audio_channels, audio_language, audio_language_code, subtitle_codec, ' \
+                    'audio_codec, audio_bitrate, audio_channels, audio_language, audio_language_code, ' \
+                    'subtitle_codec, subtitle_language, ' \
                     'stream_bitrate, stream_video_full_resolution, quality_profile, stream_container_decision, stream_container, ' \
                     'stream_video_decision, stream_video_codec, stream_video_bitrate, stream_video_width, stream_video_height, ' \
                     'stream_video_framerate, stream_video_dynamic_range, ' \
                     'stream_audio_decision, stream_audio_codec, stream_audio_bitrate, stream_audio_channels, ' \
                     'stream_audio_language, stream_audio_language_code, ' \
-                    'subtitles, stream_subtitle_decision, stream_subtitle_codec, ' \
+                    'subtitles, stream_subtitle_decision, stream_subtitle_codec, stream_subtitle_language, ' \
                     'transcode_hw_decoding, transcode_hw_encoding, ' \
                     'video_decision, audio_decision, transcode_decision, width, height, container, ' \
                     'transcode_container, transcode_video_codec, transcode_audio_codec, transcode_audio_channels, ' \