diff --git a/get_general_settings.py b/get_general_settings.py
index 37fab629f..aa36c8df8 100644
--- a/get_general_settings.py
+++ b/get_general_settings.py
@@ -57,11 +57,13 @@ def path_replace_reverse(path):
     return path
 
 def pp_replace(pp_command, episode, subtitles, language, language_code2, language_code3):
+    pp_command = pp_command.replace('{{directory}}', os.path.dirname(episode))
     pp_command = pp_command.replace('{{episode}}', episode)
+    pp_command = pp_command.replace('{{episode_name}}', os.path.splitext(os.path.basename(episode))[0])
     pp_command = pp_command.replace('{{subtitles}}', subtitles)
-    pp_command = pp_command.replace('{{language}}', language)
-    pp_command = pp_command.replace('{{language_code2}}', language_code2)
-    pp_command = pp_command.replace('{{language_code3}}', language_code3)
+    pp_command = pp_command.replace('{{subtitles_language}}', language)
+    pp_command = pp_command.replace('{{subtitles_language_code2}}', language_code2)
+    pp_command = pp_command.replace('{{subtitles_language_code3}}', language_code3)
     return pp_command
 
 result = get_general_settings()
diff --git a/views/settings.tpl b/views/settings.tpl
index 0e553bb36..ccb4b3ef6 100644
--- a/views/settings.tpl
+++ b/views/settings.tpl
@@ -264,7 +264,7 @@
                             </div>
                             <div class="collapsed column">
                                 <div class="collapsed center aligned column">
-                                    <div class="ui basic icon" data-tooltip="You can use those variables in your command (include the double curly brace): &lbrace;&lbrace;episode&rbrace;&rbrace; &lbrace;&lbrace;subtitles&rbrace;&rbrace; &lbrace;&lbrace;language&rbrace;&rbrace; &lbrace;&lbrace;language-code2&rbrace;&rbrace; &lbrace;&lbrace;language-code3&rbrace;&rbrace;" data-inverted="">
+                                    <div class="ui basic icon" data-tooltip="You can use those variables in your command (include the double curly brace): \n&lbrace;&lbrace;directory&rbrace;&rbrace; \n&lbrace;&lbrace;episode&rbrace;&rbrace; \n&lbrace;&lbrace;episode_name&rbrace;&rbrace; \n&lbrace;&lbrace;subtitles&rbrace;&rbrace; \n&lbrace;&lbrace;subtitles_language&rbrace;&rbrace; \n&lbrace;&lbrace;subtitles_language_code2&rbrace;&rbrace; \n&lbrace;&lbrace;subtitles_language_code3&rbrace;&rbrace;" data-inverted="">
                                         <i class="help circle large icon"></i>
                                     </div>
                                 </div>