Annotations widening

Widening annotations scope for NoRoute and QueryParam, related to #639