Improve search feature