improve browsing/collection handling