id changed for searchButton in master; also had bogus step

Change-Id: Id77fe9b9f9a2bfd1e2330ca27883bef863614176