fixes for search