Wiki E/M with CS modifier

[BMWilliams]

I know that the CS modifier should be used on the E/M visit, if the visit is for Covid-19 and the primary DX is U07.1. BUT, should the CS modifier be added to the E/M visit if the Dr uses the DX Z86.16 (HX of Covid)