Search fixes 2