Dynamically add report targets to the map to avoid missing keys (#2121)