Fix History and Search pages