fixes for search

fixes for search