Switch to history page state + additional tweaking