Fix search issue on exact name match