Relating Results to hosts specified in the target

HI All,
I have come across an annoyance that I am hoping is easy to fix. I am scanning a bunch of externally hosted applications (AWS, Azure, etc), and to target them I specify their DNS names as the IPs can change at any time.
However, when I view or export a report these “target” names are not included. Only reverse lookup names, and even some of those are missing.
I would ideally like the “Hostname” in the report to be the name specified in the target. Is this easily possible, or do I need to hack at the code to get this?
I do find the same thing for Internal hosts, but of course those cannot be reversed from the scanner which is in AWS.

GVM versions

Greenbone Security Assistant 9.0.1~git-3c51bbffa-gsa-9.0
Greenbone Vulnerability Manager 9.0.1~git-18379fe8-gvmd-9.0
OpenVAS 7.0.1
gvm-libs 11.0.1


CentOS 8
Kernel: (‘uname -a’)
Installed from source