Also fetch McM data if total events is defined and approval time is not

This should fix up the corrupted McM entries. Should take a trip through validation as it's not been tested. @ticoann and @geneguvo , please review.