Fix search n replace fallout