Add star protection in searching