Added resolving tags to return route.