diff --git a/ntc_templates/templates/cisco_xr_show_bgp_vrf_all_neighbors_advertised-routes.textfsm b/ntc_templates/templates/cisco_xr_show_bgp_vrf_all_neighbors_advertised-routes.textfsm
index 0be91b7dd7..857482796c 100644
--- a/ntc_templates/templates/cisco_xr_show_bgp_vrf_all_neighbors_advertised-routes.textfsm
+++ b/ntc_templates/templates/cisco_xr_show_bgp_vrf_all_neighbors_advertised-routes.textfsm
@@ -8,9 +8,12 @@ Value Filldown VRF (\S+)
 
 Start
   ^\S{3}\s+\S{3}\s+\d{1,2}\s+\d+:\d+:\d+
-  ^Network\s+Next\s+Hop\s+From\s+AS\s+Path
+  ^VRF:\s+\S+:\d+$$
+  ^-+$$
+  ^%\s+Neighbor\s+not\s+found$$
+  ^Network\s+Next\s+Hop\s+From\s+AS\s+Path$$
   ^Route\s+Distinguisher\:\s+${ROUTE_DISTINGUISHER}\s+\(default\s+for\s+vrf\s+${VRF}\)\s*$$ -> ROUTES
-  ^Processed\.* -> End
+  ^Processed\s+
   ^. -> Error
 
 ROUTES