[hhs] Deduplicate OEI reports
[hhs] Fix indentation from last commit

Split this out to keep the diffs readable