Fix Find and Replace support