Improved OrphanedPatchRemapped suggestions