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 49d3f1524b..72e1dff483 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
@@ -2,19 +2,20 @@ Value NETWORK (\d+\.\d+\.\d+\.\d+)
 Value PREFIX_LENGTH (\d+)
 Value NEXT_HOP (\d+\.\d+\.\d+\.\d+)
 Value FROM ((\d+\.\d+\.\d+\.\d+)|\S+)
-Value AS_PATH (.+)
+Value AS_PATH (.*)
 Value Filldown ROUTE_DISTINGUISHER (\d+\:\d+)
 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\s*$$
+  ^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\.*
   ^. -> Error
 
 ROUTES
   ^${NETWORK}\/${PREFIX_LENGTH}\s+${NEXT_HOP}\s+${FROM}\s+${AS_PATH} -> Record
-  ^\s*$$ -> End
+  ^\s*$$ -> Start
   ^. -> Error
 
 End