Taking minor search fixes from live server