Fix several browsing related issues