feat(resolver): better implementation of route resolver

large simplification of route resolving logic.
Release 1.5.0