Fix remove match string from navigation URL
Refined submenu match (full URL only)