Revert "Revert "Try to speed up browsing""

This reverts commit 19e1e21ee4f8799f6700e059b225180e9bac9528.
Fixed bug in the speed up browsing