Rework show/hide search button