more search&replace fixes