Improve custom search