fixing ensuing, archive and search