fixing button visibility
Fixed merged conflict in Search