Improve search archives v2