update Router to handle popstate issues on page load correctly