more fixes for search feature