fix search bar issue
Merge master fixed conflict.