Fix remaining issues in the browsing history
Merge pull request #3302 from Snuffleupagus/history-improvements

Fix remaining issues in the browsing history