Fix search replace issue