Route highlighting now works properly