Capital gains tax schedule

My current CGT gain is over $10k, so I have to fill in the ATO “Capital gains tax schedule”. In this I have to seperate my Australian gain from my overseas gain (see pic).
This is a colossal PITA. It’s made worse by the Sharesight CGT report removing exchange suffixes so I can’t see at a glance what country the gains have been made in (see pic, URNM code is in both Aus and USA).
Are there any plans to display this information? There was a post on this in 2021. Hard to believe others aren’t having a similar issue.