Added search buttons and removed auto search.