Search bugfix