some improvements for search feature