fix use of QCD collections
migrate last two macros to v02