Fix regressions caused by the recent implementation of browsing history - address comments v3
Merge pull request #3278 from Snuffleupagus/history-regression

Fix regressions caused by the recent implementation of browsing history