Add Search/Replace support