Archive page state bug fixes