Browsing: performance improvements