diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 509c618b69..7fa32ce217 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -783,25 +783,25 @@ function generate_forum_nav(&$forum_data_ary)
 			}
 
 			$navlinks_parents[] = array(
-				'S_IS_CAT'		=> ($parent_type == FORUM_CAT) ? true : false,
-				'S_IS_LINK'		=> ($parent_type == FORUM_LINK) ? true : false,
-				'S_IS_POST'		=> ($parent_type == FORUM_POST) ? true : false,
-				'FORUM_NAME'	=> $parent_name,
-				'FORUM_ID'		=> $parent_forum_id,
-				'MICRODATA'		=> $microdata_attr . '="' . $parent_forum_id . '"',
-				'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id),
+				'S_IS_CAT'			=> ($parent_type == FORUM_CAT) ? true : false,
+				'S_IS_LINK'			=> ($parent_type == FORUM_LINK) ? true : false,
+				'S_IS_POST'			=> ($parent_type == FORUM_POST) ? true : false,
+				'BREADCRUMB_NAME'	=> $parent_name,
+				'FORUM_ID'			=> $parent_forum_id,
+				'MICRODATA'			=> $microdata_attr . '="' . $parent_forum_id . '"',
+				'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id),
 			);
 		}
 	}
 
 	$navlinks = array(
-		'S_IS_CAT'		=> ($forum_data_ary['forum_type'] == FORUM_CAT) ? true : false,
-		'S_IS_LINK'		=> ($forum_data_ary['forum_type'] == FORUM_LINK) ? true : false,
-		'S_IS_POST'		=> ($forum_data_ary['forum_type'] == FORUM_POST) ? true : false,
-		'FORUM_NAME'	=> $forum_data_ary['forum_name'],
-		'FORUM_ID'		=> $forum_data_ary['forum_id'],
-		'MICRODATA'		=> $microdata_attr . '="' . $forum_data_ary['forum_id'] . '"',
-		'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_data_ary['forum_id']),
+		'S_IS_CAT'			=> ($forum_data_ary['forum_type'] == FORUM_CAT) ? true : false,
+		'S_IS_LINK'			=> ($forum_data_ary['forum_type'] == FORUM_LINK) ? true : false,
+		'S_IS_POST'			=> ($forum_data_ary['forum_type'] == FORUM_POST) ? true : false,
+		'BREADCRUMB_NAME'	=> $forum_data_ary['forum_name'],
+		'FORUM_ID'			=> $forum_data_ary['forum_id'],
+		'MICRODATA'			=> $microdata_attr . '="' . $forum_data_ary['forum_id'] . '"',
+		'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_data_ary['forum_id']),
 	);
 
 	$forum_template_data = array(
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 8e9719adfa..9c4ee1a631 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -936,8 +936,8 @@ class p_master
 				if (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id)
 				{
 					$template->assign_block_vars('navlinks', array(
-						'FORUM_NAME'	=> $item_ary['lang'],
-						'U_VIEW_FORUM'	=> $u_title,
+						'BREADCRUMB_NAME'	=> $item_ary['lang'],
+						'U_BREADCRUMB'		=> $u_title,
 					));
 				}
 
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index c5599b7851..6215a675b4 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -309,8 +309,8 @@ $vars = array(
 extract($phpbb_dispatcher->trigger_event('core.modify_mcp_modules_display_option', compact($vars)));
 
 $template->assign_block_vars('navlinks', array(
-	'FORUM_NAME'	=> $user->lang('MCP'),
-	'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}mcp.$phpEx"),
+	'BREADCRUMB_NAME'	=> $user->lang('MCP'),
+	'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}mcp.$phpEx"),
 ));
 
 // Load and execute the relevant module
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index b9bf0fde69..2f2c823feb 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -365,8 +365,8 @@ switch ($mode)
 		}
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $page_title,
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"),
+			'BREADCRUMB_NAME'	=> $page_title,
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"),
 		));
 
 		$template->assign_vars(array(
@@ -467,8 +467,8 @@ switch ($mode)
 		}
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $page_title,
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"),
+			'BREADCRUMB_NAME'	=> $page_title,
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"),
 		));
 
 		// Send vars to the template
@@ -876,12 +876,12 @@ switch ($mode)
 		$template_html = 'memberlist_view.html';
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $user->lang('MEMBERLIST'),
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
+			'BREADCRUMB_NAME'	=> $user->lang('MEMBERLIST'),
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
 		));
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $member['username'],
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"),
+			'BREADCRUMB_NAME'	=> $member['username'],
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"),
 		));
 
 	break;
@@ -950,8 +950,8 @@ switch ($mode)
 
 			generate_forum_nav($topic_data);
 			$template->assign_block_vars('navlinks', array(
-				'FORUM_NAME'	=> $topic_data['topic_title'],
-				'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id"),
+				'BREADCRUMB_NAME'	=> $topic_data['topic_title'],
+				'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id"),
 			));
 
 			$navlink_name = $user->lang('EMAIL_TOPIC');
@@ -964,8 +964,8 @@ switch ($mode)
 		}
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $navlink_name,
-			'U_VIEW_FORUM'	=> $navlink_url,
+			'BREADCRUMB_NAME'	=> $navlink_name,
+			'U_BREADCRUMB'		=> $navlink_url,
 		));
 
 	break;
@@ -1006,8 +1006,8 @@ switch ($mode)
 		$template_html = 'memberlist_body.html';
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $page_title,
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
+			'BREADCRUMB_NAME'	=> $page_title,
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
 		));
 
 		/* @var $pagination \phpbb\pagination */
@@ -1316,8 +1316,8 @@ switch ($mode)
 			}
 
 			$template->assign_block_vars('navlinks', array(
-				'FORUM_NAME'	=> $group_helper->get_name($group_row['group_name']),
-				'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&g=$group_id"),
+				'BREADCRUMB_NAME'	=> $group_helper->get_name($group_row['group_name']),
+				'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&g=$group_id"),
 			));
 
 			$template->assign_vars(array(
diff --git a/phpBB/phpbb/help/controller/bbcode.php b/phpBB/phpbb/help/controller/bbcode.php
index c3cf53fd76..560b0c02ce 100644
--- a/phpBB/phpbb/help/controller/bbcode.php
+++ b/phpBB/phpbb/help/controller/bbcode.php
@@ -26,8 +26,8 @@ class bbcode extends controller
 		$this->language->add_lang('help/bbcode');
 
 		$this->template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $this->language->lang('BBCODE_GUIDE'),
-			'U_VIEW_FORUM'	=> $this->helper->route('phpbb_help_bbcode_controller'),
+			'BREADCRUMB_NAME'	=> $this->language->lang('BBCODE_GUIDE'),
+			'U_BREADCRUMB'		=> $this->helper->route('phpbb_help_bbcode_controller'),
 		));
 
 		$this->manager->add_block(
diff --git a/phpBB/phpbb/help/controller/faq.php b/phpBB/phpbb/help/controller/faq.php
index 117723c793..0f63be5b56 100644
--- a/phpBB/phpbb/help/controller/faq.php
+++ b/phpBB/phpbb/help/controller/faq.php
@@ -26,8 +26,8 @@ class faq extends controller
 		$this->language->add_lang('help/faq');
 
 		$this->template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $this->language->lang('FAQ_EXPLAIN'),
-			'U_VIEW_FORUM'	=> $this->helper->route('phpbb_help_faq_controller'),
+			'BREADCRUMB_NAME'	=> $this->language->lang('FAQ_EXPLAIN'),
+			'U_BREADCRUMB'		=> $this->helper->route('phpbb_help_faq_controller'),
 		));
 
 		$this->manager->add_block(
diff --git a/phpBB/search.php b/phpBB/search.php
index 8e3d6b4d22..4f4a14109b 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -130,8 +130,8 @@ $phpbb_content_visibility = $phpbb_container->get('content.visibility');
 $pagination = $phpbb_container->get('pagination');
 
 $template->assign_block_vars('navlinks', array(
-	'FORUM_NAME'	=> $user->lang('SEARCH'),
-	'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}search.$phpEx"),
+	'BREADCRUMB_NAME'	=> $user->lang('SEARCH'),
+	'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}search.$phpEx"),
 ));
 
 /**
@@ -516,6 +516,11 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				$l_search_title = $user->lang['SEARCH_SELF'];
 			break;
 		}
+
+		$template->assign_block_vars('navlinks', array(
+			'BREADCRUMB_NAME'	=> $l_search_title,
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}search.$phpEx", "search_id=$search_id"),
+		));
 	}
 
 	/**
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index dc29285922..7aa5ded752 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -190,7 +190,7 @@
 
 			<!-- BEGIN navlinks -->
 				<!-- EVENT overall_header_navlink_prepend -->
-				<span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{navlinks.U_VIEW_FORUM}" itemtype="https://schema.org/Thing" itemprop="item"><span itemprop="name">{navlinks.FORUM_NAME}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span>
+				<span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{navlinks.U_BREADCRUMB}" itemtype="https://schema.org/Thing" itemprop="item"><span itemprop="name">{navlinks.BREADCRUMB_NAME}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span>
 				<!-- EVENT overall_header_navlink_append -->
 			<!-- END navlinks -->
 			<!-- EVENT overall_header_breadcrumb_append -->
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 26756d8c80..c60d9930fc 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -394,8 +394,8 @@ $vars = array('module', 'id', 'mode');
 extract($phpbb_dispatcher->trigger_event('core.ucp_display_module_before', compact($vars)));
 
 $template->assign_block_vars('navlinks', array(
-	'FORUM_NAME'	=> $user->lang('UCP'),
-	'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}ucp.$phpEx"),
+	'BREADCRUMB_NAME'	=> $user->lang('UCP'),
+	'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}ucp.$phpEx"),
 ));
 
 // Select the active module
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index f1d4527c19..1b28750a0b 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -488,8 +488,8 @@ $base_url = append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&a
 $pagination->generate_template_pagination($base_url, 'pagination', 'start', $counter, $config['topics_per_page'], $start);
 
 $template->assign_block_vars('navlinks', array(
-	'FORUM_NAME'	=> $user->lang('WHO_IS_ONLINE'),
-	'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}viewonline.$phpEx"),
+	'BREADCRUMB_NAME'	=> $user->lang('WHO_IS_ONLINE'),
+	'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx"),
 ));
 
 // Send data to template