search button cleanup, added autofocus back.