diff --git a/16x9/Buttons_Infoscreen_Path_Tracer.xml b/16x9/Buttons_Infoscreen_Path_Tracer.xml
index 64e2de5f..a06bacdf 100644
--- a/16x9/Buttons_Infoscreen_Path_Tracer.xml
+++ b/16x9/Buttons_Infoscreen_Path_Tracer.xml
@@ -60,48 +60,42 @@
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1)">ClearProperty(ContainerPath_1,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1)">ClearProperty(ContainerType_1,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1)">ClearProperty(Breadcrumb_Level,$PARAM[window])</onfocus>
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + String.IsEmpty(Window(home).Property(Origin))">Dialog.Close(all,true)</onfocus>
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + !Window.IsVisible(home) + !String.IsEmpty(Window(home).Property(Origin))">ActivateWindow(home)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1)">Dialog.Close(all,true)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + !String.IsEmpty(Window(home).Property(Origin))">ActivateWindow(home)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + !String.IsEmpty(Window(home).Property(Origin))">SetFocus(6001)</onfocus>
-
+				
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),2) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_1)],replace)</onfocus>
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),2)">ClearProperty(ContainerPath_2,$PARAM[window])</onfocus>
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),2)">SetProperty(Breadcrumb_Level,1,$PARAM[window])</onfocus>
-
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),3) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_2)],replace)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),4) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_3)],replace)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),5) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_4)],replace)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),6) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_5)],replace)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),7) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_6)],replace)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),8) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_7)],replace)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),9) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_8)],replace)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),10) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_9)],replace)</onfocus>
+
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),3)">ClearProperty(ContainerPath_3,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),3)">SetProperty(Breadcrumb_Level,2,$PARAM[window])</onfocus>
-
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),4) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_3)],replace)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),4)">SetProperty(Breadcrumb_Level,3,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),4)">ClearProperty(ContainerPath_4,$PARAM[window])</onfocus>
-
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),5) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_4)],replace)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),5)">ClearProperty(ContainerPath_5,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),5)">SetProperty(Breadcrumb_Level,4,$PARAM[window])</onfocus>
-
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),6) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_5)],replace)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),6)">ClearProperty(ContainerPath_6,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),6)">SetProperty(Breadcrumb_Level,5,$PARAM[window])</onfocus>
-
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),7) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_6)],replace)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),7)">ClearProperty(ContainerPath_7,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),7)">SetProperty(Breadcrumb_Level,6,$PARAM[window])</onfocus>
-
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),8) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_7)],replace)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),8)">ClearProperty(ContainerPath_8,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),8)">SetProperty(Breadcrumb_Level,7,$PARAM[window])</onfocus>
-
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),9) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_8)],replace)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),9)">ClearProperty(ContainerPath_9,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),9)">SetProperty(Breadcrumb_Level,8,$PARAM[window])</onfocus>
-
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),10) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">Container.Update($INFO[Window($PARAM[window]).Property(ContainerPath_9)],replace)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),10)">ClearProperty(ContainerPath_10,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),10)">SetProperty(Breadcrumb_Level,9,$PARAM[window])</onfocus>
 
 				<onfocus condition="!String.IsEqual(Window.Property(Breadcrumb_Level),1)">Dialog.Close(all,true)</onfocus>
 				<onfocus condition="!String.IsEqual(Window.Property(Breadcrumb_Level),1) + !$EXP[Infoscreen_Widget_Prefer_TMDbHelper] + Integer.IsGreater(ListItem.DBID,0)">SetFocus(6001)</onfocus>
+				
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),2)">SetProperty(Breadcrumb_Level,1,$PARAM[window])</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),2)">ClearProperty(ContainerPath_2,$PARAM[window])</onfocus>
 
 			</control>
 		</definition>
diff --git a/16x9/Custom_1198_Path_Tracing.xml b/16x9/Custom_1198_Path_Tracing.xml
index c7c79ab6..214f9b3e 100644
--- a/16x9/Custom_1198_Path_Tracing.xml
+++ b/16x9/Custom_1198_Path_Tracing.xml
@@ -58,13 +58,15 @@
 				<label>ContainerPath_1: [COLOR white][B]$INFO[Window(movieinformation).Property(ContainerPath_1)][/B][/COLOR]</label>
 				<font>Unwatched_Indicator</font>
 				<height>30</height>
-				<autoscroll>true</autoscroll>
+				<scroll>true</scroll>
+				<scrollspeed>200</scrollspeed>
 			</control>
 			<control type="label">
 				<label>ContainerPath_2: [COLOR white][B]$INFO[Window(movieinformation).Property(ContainerPath_2)][/B][/COLOR]</label>
 				<font>Unwatched_Indicator</font>
 				<height>30</height>
-				<autoscroll>true</autoscroll>
+				<scroll>true</scroll>
+				<scrollspeed>200</scrollspeed>
 			</control>
 			<control type="label">
 				<label>ContainerPath_3: [COLOR white][B]$INFO[Window(movieinformation).Property(ContainerPath_3)][/B][/COLOR]</label>
diff --git a/16x9/Custom_1199_Test_Label.xml b/16x9/Custom_1199_Test_Label.xml
index b7eb82a0..6ef9e016 100644
--- a/16x9/Custom_1199_Test_Label.xml
+++ b/16x9/Custom_1199_Test_Label.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1199">
-	<visible>true</visible>
+	<visible>false</visible>
 	<zorder>3</zorder>
 	<controls>
 		<control type="image">
@@ -8,7 +8,7 @@
 			<height>200</height>
 			<right>0</right>
 			<texture colordiffuse="pink">views/white_100.png</texture>
-			<visible>Player.HasVideo</visible>
+			<visible>Window.IsVisible(home)</visible>
 		</control>
 		<control type="label">
 			<align>right</align>
diff --git a/16x9/Navigation.xml b/16x9/Navigation.xml
index bd0535eb..cad0e23c 100644
--- a/16x9/Navigation.xml
+++ b/16x9/Navigation.xml
@@ -17,7 +17,8 @@
 			<onright condition="!$EXP[Music_Player_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + Integer.IsGreater(Container.NumItems,22)">SetFocus(4013)</onright>
 			<onright condition="!$EXP[Music_Player_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + Integer.IsLessOrEqual(Container.NumItems,22) + !$EXP[Hidden_Options_Menu_Disabled]">SetFocus(3000,0,absolute)</onright>
 			<onright condition="!$EXP[Music_Player_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + Integer.IsLessOrEqual(Container.NumItems,22) + $EXP[Hidden_Options_Menu_Disabled]">50</onright>
-			<onback condition="String.IsEqual(window(movieinformation).property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(videos) + String.IsEqual(Window(movieinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(music) + String.IsEqual(Window(musicinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
 		</definition>
 	</include>
 
@@ -81,7 +82,8 @@
 			<onright condition="Integer.IsLessOrEqual(Container.NumItems,3) + Integer.IsGreater(Container.NumItems,1)">0</onright>
 			<onright condition="Integer.IsEqual(Container.NumItems,1) + !$EXP[Hidden_Options_Menu_Disabled]">SetFocus(3000,0,absolute)</onright>
 			<onright condition="Integer.IsEqual(Container.NumItems,1) + $EXP[Hidden_Options_Menu_Disabled]">501</onright>
-			<onback condition="String.IsEqual(window(movieinformation).property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(videos) + String.IsEqual(Window(movieinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(music) + String.IsEqual(Window(musicinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
 		</definition>
 	</include>
 
@@ -104,7 +106,8 @@
 			<onright condition="Integer.IsLessOrEqual(Container.NumItems,10) + Integer.IsGreater(Container.NumItems,1)">0</onright>
 			<onright condition="Integer.IsEqual(Container.NumItems,1) + !$EXP[Hidden_Options_Menu_Disabled]">SetFocus(3000,0,absolute)</onright>
 			<onright condition="Integer.IsEqual(Container.NumItems,1) + $EXP[Hidden_Options_Menu_Disabled]">502</onright>
-			<onback condition="String.IsEqual(window(movieinformation).property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(videos) + String.IsEqual(Window(movieinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(music) + String.IsEqual(Window(musicinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
 		</definition>
 	</include>
 
@@ -127,7 +130,8 @@
 			<onright condition="Integer.IsLessOrEqual(Container.NumItems,10) + Integer.IsGreater(Container.NumItems,1)">0</onright>
 			<onright condition="Integer.IsEqual(Container.NumItems,1) + !$EXP[Hidden_Options_Menu_Disabled]">SetFocus(3000,0,absolute)</onright>
 			<onright condition="Integer.IsEqual(Container.NumItems,1) + $EXP[Hidden_Options_Menu_Disabled]">504</onright>
-			<onback condition="String.IsEqual(window(movieinformation).property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(videos) + String.IsEqual(Window(movieinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(music) + String.IsEqual(Window(musicinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
 		</definition>
 	</include>
 
@@ -146,7 +150,8 @@
 			<ondown condition="!$EXP[GridView_Display_IsFanart] + Integer.IsGreater(Container.NumItems,5)">505</ondown>
 			<ondown condition="$EXP[GridView_Display_IsFanart] + Integer.IsLessorEqual(Container.NumItems,3)">0</ondown>
 			<ondown condition="!$EXP[GridView_Display_IsFanart] + Integer.IsLessorEqual(Container.NumItems,5)">0</ondown>
-			<onback condition="String.IsEqual(window(movieinformation).property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(videos) + String.IsEqual(Window(movieinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
+			<onback condition="Window.Is(music) + String.IsEqual(Window(musicinformation).Property(SentFromInfo),true)">SetFocus(6001)</onback>
 		</definition>
 	</include>
 
@@ -375,7 +380,6 @@
 	</include>
 
 	<include name="MovieInfo_Dialog_Menu_Navigation">
-		<onback condition="!String.IsEqual(Window.Property(Breadcrumb_Level),1)">SetProperty(Infoscreen_Transition,true,home)</onback>
 		<onback>SetFocus(4020)</onback>
 		<ondown condition="Control.IsVisible(3201)">3201</ondown>
 		<ondown condition="!Control.IsVisible(3201) + Control.IsVisible(3202)">3202</ondown>
@@ -497,7 +501,9 @@
 			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">SetFocus(3204)</onfocus>
 			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">SetFocus(3205)</onfocus>
 			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">SetFocus(3206)</onfocus>
-			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0)">SetFocus($PARAM[bounce_id])</onfocus>
+			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + [Container(3201).IsUpdating | Container(3202).IsUpdating | Container(3203).IsUpdating | Container(3204).IsUpdating | Container(3205).IsUpdating | Container(3206).IsUpdating | Container(3207).IsUpdating]">SetFocus($PARAM[bounce_id])</onfocus>
+			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + ![Container(3201).IsUpdating | Container(3202).IsUpdating | Container(3203).IsUpdating | Container(3204).IsUpdating | Container(3205).IsUpdating | Container(3206).IsUpdating | Container(3207).IsUpdating]">Notification($LOCALIZE[31635],$LOCALIZE[31636],3000)</onfocus>
+			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + ![Container(3201).IsUpdating | Container(3202).IsUpdating | Container(3203).IsUpdating | Container(3204).IsUpdating | Container(3205).IsUpdating | Container(3206).IsUpdating | Container(3207).IsUpdating]">Back</onfocus>
 		</definition>
 	</include>
 
diff --git a/16x9/OnLoadUnload.xml b/16x9/OnLoadUnload.xml
index 43c9cec7..1bc8d5f8 100644
--- a/16x9/OnLoadUnload.xml
+++ b/16x9/OnLoadUnload.xml
@@ -25,8 +25,7 @@
 		<onload condition="!String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(Breadcrumb_GoToPrevious),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">ClearProperty(ContainerType_9)</onload>
 		<onload condition="!String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(Breadcrumb_GoToPrevious),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">ClearProperty(ContainerPath_10)</onload>
 		<onload condition="!String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(Breadcrumb_GoToPrevious),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">ClearProperty(ContainerType_10)</onload>
-
-		<!-- loop: If previous container path is occupied and GoToNext true, -->
+		<!-- loop: Record new container path if previous container path is occupied and GoToNext true, -->
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_10)) + !String.IsEmpty(Window.Property(ContainerPath_9)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(ContainerPath_10,$VAR[ContainerPath_X])</onload>
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_10)) + !String.IsEmpty(Window.Property(ContainerPath_9)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(ContainerType_10,$INFO[ListItem.DBType])</onload>
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_9)) + !String.IsEmpty(Window.Property(ContainerPath_8)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(ContainerPath_9,$VAR[ContainerPath_X])</onload>
@@ -45,7 +44,7 @@
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_3)) + !String.IsEmpty(Window.Property(ContainerPath_2)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(ContainerType_3,$INFO[ListItem.DBType])</onload>
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_2)) + !String.IsEmpty(Window.Property(ContainerPath_1)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(ContainerPath_2,$VAR[ContainerPath_X])</onload>
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_2)) + !String.IsEmpty(Window.Property(ContainerPath_1)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(ContainerType_2,$INFO[ListItem.DBType])</onload>
-		
+		<!-- breadcrumb counter -->
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_2)) + !String.IsEmpty(Window.Property(ContainerPath_1)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(Breadcrumb_Level,2)</onload>
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_3)) + !String.IsEmpty(Window.Property(ContainerPath_2)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(Breadcrumb_Level,3)</onload>
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_4)) + !String.IsEmpty(Window.Property(ContainerPath_3)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(Breadcrumb_Level,4)</onload>
@@ -55,7 +54,6 @@
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_8)) + !String.IsEmpty(Window.Property(ContainerPath_7)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(Breadcrumb_Level,8)</onload>
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_9)) + !String.IsEmpty(Window.Property(ContainerPath_8)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(Breadcrumb_Level,9)</onload>
 		<onload condition="String.IsEmpty(Window.Property(ContainerPath_10)) + !String.IsEmpty(Window.Property(ContainerPath_9)) + String.IsEqual(Window.Property(Breadcrumb_GoToNext),true) + !String.IsEqual(Window.Property(SentFromInfo),true)">SetProperty(Breadcrumb_Level,10)</onload>
-		
 		<onload>ClearProperty(SentFromInfo)</onload>
 		<onload>ClearProperty(Breadcrumb_GoToPrevious)</onload>
 		<onload>ClearProperty(Breadcrumb_GoToNext)</onload>
@@ -77,7 +75,6 @@
 		<onload condition="String.IsEqual(ListItem.DBType,album)">SetProperty(Info_Type,album,musicinformation)</onload>
 		<onload>SetProperty(SelectedItem,$INFO[ListItem.DBID],musicinformation)</onload>
 		<onload>SetProperty(ResetScroll," ")</onload>
-		<include content="Infoscreen_PathTracing" />
 		<include content="Widget_Position_Reset_OnLoad" />
 		<onunload>ClearProperty(Focused_Button,musicinformation)</onunload>
 	</include>
diff --git a/16x9/Templates_Dialogs.xml b/16x9/Templates_Dialogs.xml
index 82c36646..e918de30 100644
--- a/16x9/Templates_Dialogs.xml
+++ b/16x9/Templates_Dialogs.xml
@@ -16,9 +16,6 @@
 			<include content="Infoscreen_Path_Tracer_Button" condition="Window.Is(movieinformation)">
 				<param name="window" value="movieinformation" />
 			</include>
-			<include content="Infoscreen_Path_Tracer_Button" condition="Window.Is(musicinformation)">
-				<param name="window" value="musicinformation" />
-			</include>
 			<include content="MyViews_Multiart_Labels">
 				<param name="include_type_label" value="false" />
 				<param name="template" value="Infoscreen_Multiart" />
diff --git a/16x9/Variables_Paths_Widgets.xml b/16x9/Variables_Paths_Widgets.xml
index d154ad13..d2742371 100644
--- a/16x9/Variables_Paths_Widgets.xml
+++ b/16x9/Variables_Paths_Widgets.xml
@@ -24,6 +24,12 @@
 	<!-- Info -->
 	<variable name="ContainerPath_X">
 		<value condition="!String.IsEmpty(Container.FolderPath)">$INFO[Container.FolderPath]</value>
+		<value condition="Integer.IsGreater(ListItem.DBID,0) + String.IsEqual(ListItem.DBType,movie)">videodb://movies/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D</value>
+		<value condition="Integer.IsGreater(ListItem.DBID,0) + String.IsEqual(ListItem.DBType,tvshow)">videodb://tvshows/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D</value>
+		<value condition="Integer.IsGreater(ListItem.DBID,0) + String.IsEqual(ListItem.DBType,episode)">videodb://movies/titles/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22episodes%22%7D</value>
+		<value condition="Integer.IsGreater(ListItem.DBID,0) + String.IsEqual(ListItem.DBType,artist)">musicdb://artists/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D</value>
+		<value condition="Integer.IsGreater(ListItem.DBID,0) + String.IsEqual(ListItem.DBType,album)">musicdb://albums/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22albums%22%7D</value>
+		<value condition="Integer.IsGreater(ListItem.DBID,0) + String.IsEqual(ListItem.DBType,song)">musicdb://songs/?xsp=%7B%22order%22%3A%7B%22direction%22%3A%22ascending%22%2C%22ignorefolders%22%3A0%2C%22method%22%3A%22sorttitle%22%7D%2C%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22songs%22%7D</value>
 		<value>$INFO[ListItem.FolderPath]</value>
 	</variable>
 
diff --git a/README.md b/README.md
index c7e51108..f5530223 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 - Added option to prefer TMDbHelper plugin if it's enabled as the content source for info screen widgets, under Settings > Copacetic > Customisations > Info screens https://github.com/realcopacetic/skin.copacetic/issues/105
 - Fixed bug in window transition animations between home, settings etc to ensure that when background slideshow is the same between two windows, the transition is instantaneous
 - Fixed a bug in how views are displayed when a home widget redirects to a view in videos window https://github.com/realcopacetic/skin.copacetic/issues/167
+- Added error notification if global search returns 0 results.
 
 Still to do:
 - infoscreen transition when using tmdbhelper widgets
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index b59a99a8..5d233518 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -1529,7 +1529,7 @@ msgstr ""
 
 
 #: M
-
+#: NEW
 #/16x9/MyPVRChannels.xml
 msgctxt "#31634"
 msgid "Now playing channel"
@@ -1538,6 +1538,22 @@ msgstr ""
 
 
 
+#: N
+#: NEW
+#/16x9/Navigation.xml
+msgctxt "#31635"
+msgid "Global search"
+msgstr ""
+
+#: NEW
+#/16x9/Navigation.xml
+msgctxt "#31636"
+msgid "Sorry no results found!"
+msgstr ""
+
+
+
+
 #: V
 
 #/16x9/Variables_Labels_Windows.xml