Search handler code cleanup