SearchButton_Click() upgraded