MT#9237 Fix editing advanced CF map with n>1 recs