Search bugfixes
Hotfixes