Added fix for -rescue and -orig breaking the name-label match.