Fixes for search.