Addresses David's comments

@elainethale Reporting measures imported from the baseline are put in the wrong place, where does that code live?

[#54074563]