fixed search bar bug
fixed conflict