More adjustments for search