Browsing: Improve router stability