Final fixes for search