Improve advanced salvage string