Widen noroute annotation

Widen the NoRoute annotation scope