Adjusted navigateToUrl behaviour