Fix history support for catalog and mode selection