MODE-2093: Fix URL history