fix cases for search switch