Browsing: code fixes