diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index da3d589..0f5449d 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -796,7 +796,11 @@ msgctxt "#31191"
 msgid "Which extra would you like to watch?"
 msgstr ""
 
-#empty strings from id 31192 to 31193
+msgctxt "#31192"
+msgid "Director"
+msgstr ""
+
+#empty string with id 31193
 
 msgctxt "#31194"
 msgid "Submit"
@@ -931,7 +935,7 @@ msgid "Please try again later."
 msgstr ""
 
 msgctxt "#31232"
-msgid "Cast and Role"
+msgid "Also directed by"
 msgstr ""
 
 msgctxt "#31233"
diff --git a/xml/DialogFullScreenInfo.xml b/xml/DialogFullScreenInfo.xml
index e523a2f..00755d3 100644
--- a/xml/DialogFullScreenInfo.xml
+++ b/xml/DialogFullScreenInfo.xml
@@ -40,7 +40,7 @@
 						<font>Med48</font>
 						<aligny>bottom</aligny>
 						<textcolor>ffdadada</textcolor>
-						<label>31232</label>
+						<label>$LOCALIZE[31076]</label>
 					</control>
 					<control type="image">
 						<top>76</top>
diff --git a/xml/Includes_Dialog_Movie_TV_Information.xml b/xml/Includes_Dialog_Movie_TV_Information.xml
index 43ad99b..c02e8f5 100644
--- a/xml/Includes_Dialog_Movie_TV_Information.xml
+++ b/xml/Includes_Dialog_Movie_TV_Information.xml
@@ -59,22 +59,24 @@
 				<onleft>Close</onleft>
 				<onright>500</onright>
 				<onfocus>ClearProperty(RecommendedVideos,home)</onfocus>
+				<onfocus>ClearProperty(DirectedByList,home)</onfocus>
 				<font>Light35</font>
 				<textcolor>ffdadada</textcolor>
 				<focusedcolor>ffffc24b</focusedcolor>
 				<label>$LOCALIZE[31026]</label>
 				<include>NoTextures</include>
-				<animation condition="!String.IsEmpty(Window(home).Property(RecommendedVideos))" effect="fade" end="50" start="100" time="0">Conditional</animation>
+				<animation condition="![String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))]" effect="fade" end="50" start="100" time="0">Conditional</animation>
 			</control>
 			<control id="7001" type="button">
 				<top>1146</top>
 				<width>960</width>
 				<height>70</height>
 				<onup>7000</onup>
-				<ondown>noop</ondown>
+				<ondown>7002</ondown>
 				<onleft>Close</onleft>
 				<onright>500</onright>
 				<onfocus>SetProperty(RecommendedVideos,1,home)</onfocus>
+				<onfocus>ClearProperty(DirectedByList,home)</onfocus>
 				<font>Light35</font>
 				<textcolor>ffdadada</textcolor>
 				<focusedcolor>ffffc24b</focusedcolor>
@@ -82,6 +84,25 @@
 				<include>NoTextures</include>
 				<animation condition="String.IsEmpty(Window(home).Property(RecommendedVideos))" effect="fade" end="50" start="100" time="0">Conditional</animation>
 			</control>
+			<control id="7002" type="button">
+				<top>1256</top>
+				<width>960</width>
+				<height>70</height>
+				<onup>7001</onup>
+				<ondown>noop</ondown>
+				<onleft>Close</onleft>
+				<onright>500</onright>
+				<onfocus>SetProperty(DirectedByList,1,home)</onfocus>
+				<onfocus>ClearProperty(RecommendedVideos,home)</onfocus>
+				<font>Light35</font>
+				<textcolor>ffdadada</textcolor>
+				<focusedcolor>ffffc24b</focusedcolor>
+				<label>$LOCALIZE[31192]</label>
+				<include>NoTextures</include>
+				<visible>String.IsEqual(ListItem.DBTYPE,movie)</visible>
+				<animation condition="String.IsEmpty(Window(home).Property(DirectedByList))" effect="fade" end="50" start="100" time="0">Conditional</animation>
+				<animation condition="!Control.IsVisible(7001)" effect="slide" end="0,-110" start="0,0" time="0">Conditional</animation>
+			</control>
 		</control>
 		<control type="group">
 			<left>950</left>
@@ -338,21 +359,21 @@
 				<top>-542</top>
 				<width>4800</width>
 				<height>1152</height>
-				<onclick condition="String.IsEmpty(Window(home).Property(RecommendedVideos))">RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(500).ListItem.Label],type=person,call_auto=1113)</onclick>
-				<onclick condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.DBTYPE,movie)">RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(500).ListItem.Label],type=movie,call_auto=1113)</onclick>
-				<onclick condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEqual(ListItem.DBTYPE,movie)">RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(500).ListItem.Label],type=tv,call_auto=1113)</onclick>
+				<onclick>RunScript(plugin.video.themoviedb.helper,add_path=$INFO[Container(500).ListItem.FolderPath],call_auto=1113)</onclick>
 				<onclick>Control.SetFocus(500,0,absolute)</onclick>
 				<onup condition="Control.IsVisible(96)">3000</onup>
 				<onup>Control.SetFocus(500,0,absolute)</onup>
 				<ondown>noop</ondown>
 				<onleft>Control.SetFocus(500,0,absolute)</onleft>
-				<onleft condition="String.IsEmpty(Window(home).Property(RecommendedVideos))">7000</onleft>
+				<onleft condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))">7000</onleft>
 				<onleft condition="!String.IsEmpty(Window(home).Property(RecommendedVideos))">7001</onleft>
+				<onleft condition="!String.IsEmpty(Window(home).Property(DirectedByList))">7002</onleft>
 				<onright>noop</onright>
 				<onright condition="!Window.IsVisible(1103)">SetProperty(BounceRight,1,Home)</onright>
 				<onback>Control.SetFocus(500,0,absolute)</onback>
-				<onback condition="String.IsEmpty(Window(home).Property(RecommendedVideos))">7000</onback>
+				<onback condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))">7000</onback>
 				<onback condition="!String.IsEmpty(Window(home).Property(RecommendedVideos))">7001</onback>
+				<onback condition="!String.IsEmpty(Window(home).Property(DirectedByList))">7002</onback>
 				<preloaditems>2</preloaditems>
 				<focusposition>2</focusposition>
 				<viewtype label="">list</viewtype>
@@ -385,7 +406,7 @@
 							<width>640</width>
 							<height>330</height>
 							<texture border="4">views/default_overlay.png</texture>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos))</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 						</control>
 						<control type="label">
 							<left>36</left>
@@ -396,7 +417,7 @@
 							<textcolor>ffffffff</textcolor>
 							<shadowcolor>ShadowColour</shadowcolor>
 							<label>$INFO[ListItem.Label]</label>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos))</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 							<animation condition="String.IsEmpty(ListItem.Label2)" effect="slide" end="0,62" start="0,0" time="0">Conditional</animation>
 						</control>
 						<control type="label">
@@ -409,7 +430,7 @@
 							<textcolor>ffffffff</textcolor>
 							<shadowcolor>ShadowColour</shadowcolor>
 							<label>$INFO[ListItem.Label2,$LOCALIZE[20347] ,]</label>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label2)</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label2) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 						</control>
 						<control type="image">
 							<top>96</top>
@@ -458,7 +479,7 @@
 							<width>640</width>
 							<height>330</height>
 							<texture border="4">views/default_overlay.png</texture>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos))</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 							<include content="FocusedListIDAnimation">
 								<param name="ListID" value="500"/>
 							</include>
@@ -473,7 +494,7 @@
 							<textcolor>ffffffff</textcolor>
 							<shadowcolor>ShadowColour</shadowcolor>
 							<label>$INFO[ListItem.Label]</label>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos))</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 							<animation condition="String.IsEmpty(ListItem.Label2)" effect="slide" end="0,62" start="0,0" time="0">Conditional</animation>
 							<include content="FocusedListIDAnimation">
 								<param name="ListID" value="500"/>
@@ -489,7 +510,7 @@
 							<textcolor>ffffffff</textcolor>
 							<shadowcolor>ShadowColour</shadowcolor>
 							<label>$INFO[ListItem.Label2,$LOCALIZE[20347] ,]</label>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label2)</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label2) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 							<include content="FocusedListIDAnimation">
 								<param name="ListID" value="500"/>
 							</include>
@@ -536,6 +557,7 @@
 					<font>Light24</font>
 					<textcolor>ffbcbcbc</textcolor>
 					<label>$INFO[Container(500).ListItem.Label2,$LOCALIZE[20347] ,]</label>
+					<visible>String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 				</control>
 			</control>
 		</control>
diff --git a/xml/Includes_Dialog_Video_Information.xml b/xml/Includes_Dialog_Video_Information.xml
index c22f678..87275ee 100644
--- a/xml/Includes_Dialog_Video_Information.xml
+++ b/xml/Includes_Dialog_Video_Information.xml
@@ -127,22 +127,24 @@
 				<onleft>Close</onleft>
 				<onright>9000</onright>
 				<onfocus>ClearProperty(RecommendedVideos,home)</onfocus>
+				<onfocus>ClearProperty(DirectedByList,home)</onfocus>
 				<font>Light35</font>
 				<textcolor>ffdadada</textcolor>
 				<focusedcolor>ffffc24b</focusedcolor>
 				<label>$LOCALIZE[31026]</label>
 				<include>NoTextures</include>
-				<animation condition="!String.IsEmpty(Window(home).Property(RecommendedVideos))" effect="fade" end="50" start="100" time="0">Conditional</animation>
+				<animation condition="![String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))]" effect="fade" end="50" start="100" time="0">Conditional</animation>
 			</control>
 			<control id="7001" type="button">
 				<top>1146</top>
 				<width>960</width>
 				<height>70</height>
 				<onup>7000</onup>
-				<ondown>noop</ondown>
+				<ondown>7002</ondown>
 				<onleft>Close</onleft>
 				<onright>500</onright>
 				<onfocus>SetProperty(RecommendedVideos,1,home)</onfocus>
+				<onfocus>ClearProperty(DirectedByList,home)</onfocus>
 				<font>Light35</font>
 				<textcolor>ffdadada</textcolor>
 				<focusedcolor>ffffc24b</focusedcolor>
@@ -150,6 +152,25 @@
 				<include>NoTextures</include>
 				<animation condition="String.IsEmpty(Window(home).Property(RecommendedVideos))" effect="fade" end="50" start="100" time="0">Conditional</animation>
 			</control>
+			<control id="7002" type="button">
+				<top>1256</top>
+				<width>960</width>
+				<height>70</height>
+				<onup>7001</onup>
+				<ondown>noop</ondown>
+				<onleft>Close</onleft>
+				<onright>500</onright>
+				<onfocus>SetProperty(DirectedByList,1,home)</onfocus>
+				<onfocus>ClearProperty(RecommendedVideos,home)</onfocus>
+				<font>Light35</font>
+				<textcolor>ffdadada</textcolor>
+				<focusedcolor>ffffc24b</focusedcolor>
+				<label>$LOCALIZE[31192]</label>
+				<include>NoTextures</include>
+				<visible>String.IsEqual(ListItem.DBTYPE,movie)</visible>
+				<animation condition="String.IsEmpty(Window(home).Property(DirectedByList))" effect="fade" end="50" start="100" time="0">Conditional</animation>
+				<animation condition="!Control.IsVisible(7001)" effect="slide" end="0,-110" start="0,0" time="0">Conditional</animation>
+			</control>
 		</control>
 		<control type="group">
 			<left>1020</left>
@@ -630,21 +651,21 @@
 				<top>-542</top>
 				<width>4800</width>
 				<height>1152</height>
-				<onclick condition="String.IsEmpty(Window(home).Property(RecommendedVideos))">RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(500).ListItem.Label],type=person,call_auto=1113)</onclick>
-				<onclick condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.DBTYPE,movie)">RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(500).ListItem.Label],type=movie,call_auto=1113)</onclick>
-				<onclick condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEqual(ListItem.DBTYPE,movie)">RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Container(500).ListItem.Label],type=tv,call_auto=1113)</onclick>
+				<onclick>RunScript(plugin.video.themoviedb.helper,add_path=$INFO[Container(500).ListItem.FolderPath],call_auto=1113)</onclick>
 				<onclick>Control.SetFocus(500,0,absolute)</onclick>
 				<onup>Control.SetFocus(500,0,absolute)</onup>
 				<onup>9001</onup>
 				<ondown>noop</ondown>
 				<onleft>Control.SetFocus(500,0,absolute)</onleft>
-				<onleft condition="String.IsEmpty(Window(home).Property(RecommendedVideos))">7000</onleft>
+				<onleft condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))">7000</onleft>
 				<onleft condition="!String.IsEmpty(Window(home).Property(RecommendedVideos))">7001</onleft>
+				<onleft condition="!String.IsEmpty(Window(home).Property(DirectedByList))">7002</onleft>
 				<onright>noop</onright>
 				<onright condition="!Window.IsVisible(1103)">SetProperty(BounceRight,1,Home)</onright>
 				<onback>Control.SetFocus(500,0,absolute)</onback>
-				<onback condition="String.IsEmpty(Window(home).Property(RecommendedVideos))">7000</onback>
+				<onback condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))">7000</onback>
 				<onback condition="!String.IsEmpty(Window(home).Property(RecommendedVideos))">7001</onback>
+				<onback condition="!String.IsEmpty(Window(home).Property(DirectedByList))">7002</onback>
 				<preloaditems>2</preloaditems>
 				<focusposition>2</focusposition>
 				<viewtype label="">list</viewtype>
@@ -677,7 +698,7 @@
 							<width>640</width>
 							<height>330</height>
 							<texture border="4">views/default_overlay.png</texture>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos))</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 						</control>
 						<control type="label">
 							<left>36</left>
@@ -688,7 +709,7 @@
 							<textcolor>ffffffff</textcolor>
 							<shadowcolor>ShadowColour</shadowcolor>
 							<label>$INFO[ListItem.Label]</label>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos))</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 							<animation condition="String.IsEmpty(ListItem.Label2)" effect="slide" end="0,62" start="0,0" time="0">Conditional</animation>
 						</control>
 						<control type="label">
@@ -701,7 +722,7 @@
 							<textcolor>ffffffff</textcolor>
 							<shadowcolor>ShadowColour</shadowcolor>
 							<label>$INFO[ListItem.Label2,$LOCALIZE[20347] ,]</label>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label2)</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label2) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 						</control>
 						<control type="image">
 							<top>96</top>
@@ -750,7 +771,7 @@
 							<width>640</width>
 							<height>330</height>
 							<texture border="4">views/default_overlay.png</texture>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos))</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 							<include content="FocusedListIDAnimation">
 								<param name="ListID" value="500"/>
 							</include>
@@ -765,7 +786,7 @@
 							<textcolor>ffffffff</textcolor>
 							<shadowcolor>ShadowColour</shadowcolor>
 							<label>$INFO[ListItem.Label]</label>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos))</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 							<animation condition="String.IsEmpty(ListItem.Label2)" effect="slide" end="0,62" start="0,0" time="0">Conditional</animation>
 							<include content="FocusedListIDAnimation">
 								<param name="ListID" value="500"/>
@@ -781,7 +802,7 @@
 							<textcolor>ffffffff</textcolor>
 							<shadowcolor>ShadowColour</shadowcolor>
 							<label>$INFO[ListItem.Label2,$LOCALIZE[20347] ,]</label>
-							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label2)</visible>
+							<visible>!Container.Content(Sets) + !String.IsEmpty(ListItem.Label2) + String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 							<include content="FocusedListIDAnimation">
 								<param name="ListID" value="500"/>
 							</include>
@@ -828,6 +849,7 @@
 					<font>Light24</font>
 					<textcolor>ffbcbcbc</textcolor>
 					<label>$INFO[Container(500).ListItem.Label2,$LOCALIZE[20347] ,]</label>
+					<visible>String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList))</visible>
 				</control>
 			</control>
 		</control>
diff --git a/xml/Includes_Variables.xml b/xml/Includes_Variables.xml
index 8fbc0cc..abf21c1 100644
--- a/xml/Includes_Variables.xml
+++ b/xml/Includes_Variables.xml
@@ -128,30 +128,35 @@
 		</value>
 	</variable>
 	<variable name="DialogPersonInfoListContent">
-		<value condition="String.IsEqual(ListItem.Property(item.type),person) + String.IsEmpty(Window(home).Property(StarredInTV)) + String.IsEmpty(Window(home).Property(ActorImages))">plugin://plugin.video.themoviedb.helper?info=stars_in_movies&amp;tmdb_type=person&amp;TMDb_ID=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false&amp;limit=100</value>
-		<value condition="!String.IsEmpty(Window(home).Property(StarredInTV))">plugin://plugin.video.themoviedb.helper?info=stars_in_tvshows&amp;tmdb_type=person&amp;TMDb_ID=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false&amp;limit=100</value>
-		<value condition="!String.IsEmpty(Window(home).Property(ActorImages))">plugin://plugin.video.themoviedb.helper?info=images&amp;tmdb_type=person&amp;TMDb_ID=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
+		<value condition="String.IsEqual(ListItem.Property(item.type),person) + String.IsEmpty(Window(home).Property(StarredInTV)) + String.IsEmpty(Window(home).Property(ActorImages))">plugin://plugin.video.themoviedb.helper?info=stars_in_movies&amp;tmdb_type=person&amp;tmdb_id=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false&amp;limit=100</value>
+		<value condition="!String.IsEmpty(Window(home).Property(StarredInTV))">plugin://plugin.video.themoviedb.helper?info=stars_in_tvshows&amp;tmdb_type=person&amp;tmdb_id=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false&amp;limit=100</value>
+		<value condition="!String.IsEmpty(Window(home).Property(ActorImages))">plugin://plugin.video.themoviedb.helper?info=images&amp;tmdb_type=person&amp;tmdb_id=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
 	</variable>
 	<variable name="DialogMovieInfoListContent">
-		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.Property(item.type),movie)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_type=movie&amp;aggregate=true&amp;TMDb_ID=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
-		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.Property(item.type),tv)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_type=tv&amp;aggregate=true&amp;TMDb_ID=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
-		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.Property(item.type),movie)">plugin://plugin.video.themoviedb.helper?info=recommendations&amp;tmdb_type=movie&amp;TMDb_ID=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
-		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.Property(item.type),tv)">plugin://plugin.video.themoviedb.helper?info=recommendations&amp;tmdb_type=tv&amp;TMDb_ID=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
+		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList)) + String.IsEqual(ListItem.Property(item.type),movie)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_type=movie&amp;aggregate=true&amp;tmdb_id=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
+		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList)) + String.IsEqual(ListItem.Property(item.type),tv)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_type=tv&amp;aggregate=true&amp;tmdb_id=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
+		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.Property(item.type),movie)">plugin://plugin.video.themoviedb.helper?info=recommendations&amp;tmdb_type=movie&amp;tmdb_id=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
+		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.Property(item.type),tv)">plugin://plugin.video.themoviedb.helper?info=recommendations&amp;tmdb_type=tv&amp;tmdb_id=$INFO[ListItem.Property(TMDb_ID)]&amp;nextpage=false</value>
+		<value condition="!String.IsEmpty(Window(home).Property(DirectedByList)) + !String.IsEmpty(ListItem.Director) + String.IsEqual(Container(99950).ListItem.DBType,movie)">plugin://plugin.video.themoviedb.helper?info=crew_in_both&amp;type=person&amp;filter_key=job&amp;filter_value=Director&amp;query=$INFO[ListItem.Director]&amp;exclude_key=title&amp;exclude_value=$INFO[ListItem.Title]&amp;aggregate=true&amp;nextpage=false</value>
 	</variable>
 	<variable name="DialogVideoInfoListContent">
-        <value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEmpty(Container(99950).ListItem.Property(TMDb_ID)) + String.IsEqual(Container(99950).ListItem.DBType,movie)">plugin://plugin.video.themoviedb.helper?info=cast&amp;TMDb_ID=$INFO[Container(99950).ListItem.Property(TMDb_ID)]&amp;tmdb_type=movie&amp;aggregate=true&amp;nextpage=false</value>
-        <value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEmpty(Container(99950).ListItem.Property(TMDb_ID)) + String.IsEqual(Container(99950).ListItem.DBType,tvshow)">plugin://plugin.video.themoviedb.helper?info=cast&amp;TMDb_ID=$INFO[Container(99950).ListItem.Property(TMDb_ID)]&amp;tmdb_type=tv&amp;aggregate=true&amp;nextpage=false</value>
-        <value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEmpty(Container(99950).ListItem.Property(TVShow.TMDb_ID)) + [String.IsEqual(Container(99950).ListItem.DBType,season) | String.IsEqual(Container(99950).ListItem.DBType,episode)]">plugin://plugin.video.themoviedb.helper?info=cast&amp;TMDb_ID=$INFO[Container(99950).ListItem.Property(TVShow.TMDb_ID)]&amp;tmdb_type=tv&amp;aggregate=true&amp;nextpage=false</value>
-		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.DBTYPE,movie)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_type=movie&amp;aggregate=true&amp;query=$INFO[ListItem.Title]&amp;year=$INFO[ListItem.Year]&amp;nextpage=false</value>
-		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEqual(ListItem.DBTYPE,movie)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_type=tv&amp;aggregate=true&amp;query=$INFO[ListItem.TVShowTitle]&amp;year=$INFO[ListItem.Year]&amp;nextpage=false</value>
+		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList)) + !String.IsEmpty(Container(99950).ListItem.Property(TMDb_ID)) + String.IsEqual(Container(99950).ListItem.DBType,movie)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_id=$INFO[Container(99950).ListItem.Property(TMDb_ID)]&amp;tmdb_type=movie&amp;aggregate=true&amp;nextpage=false</value>
+		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList)) + !String.IsEmpty(Container(99950).ListItem.Property(TMDb_ID)) + String.IsEqual(Container(99950).ListItem.DBType,tvshow)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_id=$INFO[Container(99950).ListItem.Property(TMDb_ID)]&amp;tmdb_type=tv&amp;aggregate=true&amp;nextpage=false</value>
+		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList)) + !String.IsEmpty(Container(99950).ListItem.Property(TVShow.TMDb_ID)) + [String.IsEqual(Container(99950).ListItem.DBType,season) | String.IsEqual(Container(99950).ListItem.DBType,episode)]">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_id=$INFO[Container(99950).ListItem.Property(TVShow.TMDb_ID)]&amp;tmdb_type=tv&amp;aggregate=true&amp;nextpage=false</value>
+		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList)) + String.IsEqual(ListItem.DBTYPE,movie)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_type=movie&amp;aggregate=true&amp;query=$INFO[ListItem.Title]&amp;year=$INFO[ListItem.Year]&amp;nextpage=false</value>
+		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList)) + !String.IsEqual(ListItem.DBTYPE,movie)">plugin://plugin.video.themoviedb.helper?info=cast&amp;tmdb_type=tv&amp;aggregate=true&amp;query=$INFO[ListItem.TVShowTitle]&amp;year=$INFO[ListItem.Year]&amp;nextpage=false</value>
+		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEmpty(Container(99950).ListItem.Property(TMDb_ID)) + String.IsEqual(Container(99950).ListItem.DBType,movie)">plugin://plugin.video.themoviedb.helper?info=recommendations&amp;tmdb_id=$INFO[Container(99950).ListItem.Property(TMDb_ID)]&amp;tmdb_type=movie&amp;aggregate=true&amp;nextpage=false</value>
+		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEmpty(Container(99950).ListItem.Property(TMDb_ID)) + String.IsEqual(Container(99950).ListItem.DBType,tvshow)">plugin://plugin.video.themoviedb.helper?info=recommendations&amp;tmdb_id=$INFO[Container(99950).ListItem.Property(TMDb_ID)]&amp;tmdb_type=tv&amp;aggregate=true&amp;nextpage=false</value>
+		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEmpty(Container(99950).ListItem.Property(TVShow.TMDb_ID)) + [String.IsEqual(Container(99950).ListItem.DBType,season) | String.IsEqual(Container(99950).ListItem.DBType,episode)]">plugin://plugin.video.themoviedb.helper?info=recommendations&amp;tmdb_id=$INFO[Container(99950).ListItem.Property(TVShow.TMDb_ID)]&amp;tmdb_type=tv&amp;aggregate=true&amp;nextpage=false</value>
 		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEqual(ListItem.DBTYPE,movie)">plugin://plugin.video.themoviedb.helper?info=recommendations&amp;tmdb_type=movie&amp;query=$INFO[ListItem.Title]&amp;year=$INFO[ListItem.Year]&amp;nextpage=false</value>
 		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEqual(ListItem.DBTYPE,movie)">plugin://plugin.video.themoviedb.helper?info=recommendations&amp;tmdb_type=tv&amp;query=$INFO[ListItem.TVShowTitle]&amp;year=$INFO[ListItem.Year]&amp;nextpage=false</value>
+		<value condition="!String.IsEmpty(Window(home).Property(DirectedByList)) + !String.IsEmpty(ListItem.Director) + String.IsEqual(Container(99950).ListItem.DBType,movie)">plugin://plugin.video.themoviedb.helper?info=crew_in_both&amp;type=person&amp;filter_key=job&amp;filter_value=Director&amp;query=$INFO[ListItem.Director]&amp;exclude_key=title&amp;exclude_value=$INFO[ListItem.Title]&amp;aggregate=true&amp;nextpage=false</value>
 	</variable>
 	<variable name="XRayCast">
-		<value condition="VideoPlayer.Content(movies) + !String.IsEmpty(Window(Home).Property(TMDbHelper.Player.TMDb_ID)) + String.IsEqual(Window(Home).Property(TMDbHelper.Player.Title),VideoPlayer.Title)">plugin://plugin.video.themoviedb.helper/?info=cast&amp;tmdb_type=movie$INFO[Window(Home).Property(TMDbHelper.Player.TMDb_ID),&amp;TMDb_ID=,]</value>
+		<value condition="VideoPlayer.Content(movies) + !String.IsEmpty(Window(Home).Property(TMDbHelper.Player.TMDb_ID)) + String.IsEqual(Window(Home).Property(TMDbHelper.Player.Title),VideoPlayer.Title)">plugin://plugin.video.themoviedb.helper/?info=cast&amp;tmdb_type=movie$INFO[Window(Home).Property(TMDbHelper.Player.TMDb_ID),&amp;tmdb_id=,]</value>
 		<value condition="VideoPlayer.Content(movies) + !String.IsEmpty(VideoPlayer.IMDBNumber) + String.StartsWith(VideoPlayer.IMDBNumber,tt)">plugin://plugin.video.themoviedb.helper/?info=cast&amp;tmdb_type=movie$INFO[VideoPlayer.IMDBNumber,&amp;imdb_id=,]</value>
 		<value condition="VideoPlayer.Content(movies)">plugin://plugin.video.themoviedb.helper/?info=cast&amp;tmdb_type=movie$INFO[Player.Title,&amp;query=,]$INFO[VideoPlayer.Year,&amp;year=,]</value>
-		<value condition="VideoPlayer.Content(episodes) + !String.IsEmpty(Window(Home).Property(TMDbHelper.Player.tvshow.TMDb_ID)) + String.IsEqual(Window(Home).Property(TMDbHelper.Player.Title),VideoPlayer.Title)">plugin://plugin.video.themoviedb.helper/?info=cast&amp;tmdb_type=tv$INFO[Window(Home).Property(TMDbHelper.Player.tvshow.TMDb_ID),&amp;TMDb_ID=,]$INFO[VideoPlayer.Season,&amp;season=,]$INFO[VideoPlayer.Episode,&amp;episode=,]</value>
+		<value condition="VideoPlayer.Content(episodes) + !String.IsEmpty(Window(Home).Property(TMDbHelper.Player.tvshow.TMDb_ID)) + String.IsEqual(Window(Home).Property(TMDbHelper.Player.Title),VideoPlayer.Title)">plugin://plugin.video.themoviedb.helper/?info=cast&amp;tmdb_type=tv$INFO[Window(Home).Property(TMDbHelper.Player.tvshow.TMDb_ID),&amp;tmdb_id=,]$INFO[VideoPlayer.Season,&amp;season=,]$INFO[VideoPlayer.Episode,&amp;episode=,]</value>
 		<value condition="VideoPlayer.Content(episodes)">plugin://plugin.video.themoviedb.helper/?info=cast&amp;tmdb_type=tv$INFO[VideoPlayer.TVShowTitle,&amp;query=,]$INFO[VideoPlayer.Season,&amp;season=,]$INFO[VideoPlayer.Episode,&amp;episode=,]</value>
 	</variable>
 	<variable name="DialogSelectImage">
@@ -523,8 +528,9 @@
 		<value>ff717171</value>
 	</variable>
 	<variable name="VideoInfoLabelHeading">
-		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEmpty(Container(500).ListItem.Label)">$LOCALIZE[31076]</value>
+		<value condition="String.IsEmpty(Window(home).Property(RecommendedVideos)) + String.IsEmpty(Window(home).Property(DirectedByList)) + !String.IsEmpty(Container(500).ListItem.Label)">$LOCALIZE[31076]</value>
 		<value condition="!String.IsEmpty(Window(home).Property(RecommendedVideos)) + !String.IsEmpty(Container(500).ListItem.Label)">$LOCALIZE[31113]</value>
+		<value condition="!String.IsEmpty(Window(home).Property(DirectedByList)) + !String.IsEmpty(Container(500).ListItem.Label)">$LOCALIZE[31232] $INFO[ListItem.Director]</value>
 		<value condition="String.IsEqual(ListItem.DBTYPE,set)">$LOCALIZE[31066]</value>
 	</variable>
 	<variable name="ExtendedInfoLabelHeading">