Better deep link support in new router.