Fix overzelous search & replace