fixed search button
fixed conflict