search system rework