MAP-576: DONT override exclusions of modifiers for Y95-Y98