More fixes for search