Add fix for search button