Fix regressions caused by the recent implementation of browsing history - address comments v2