Browsing: improve safety