Fix search name behavior