AGI & AGIX not being handled properly

Describe the problem:
On 2021-05-28, AGI forked/was replaced by AGIX and the original AGI coin became untradeable, with AGI holders being airdropped an equivalent amount of AGIX as a replacement.

I have read several replies on this forum from @Petur_Koinly mentioning that Koinly is going to just treat AGI and AGIX as the same coin, and that the only thing that Koinly users will need to do is delete the transaction on Koinly where AGIX was airdropped to us, so that we don’t have double the amount of AGIX displaying on Koinly than we actually hold.

However, Koinly is not working properly. Koinly correctly shows my transactions/transfers from KuCoin as being AGIX, but it shows transactions from my ETH blockchain import as being AGI.

Below is a screenshot that is actually a nested screenshot of two screenshots.

In the “not merged.png” screenshot, the two transactions are actually supposed to only be one transaction, but since the KuCoin import is showing the coin as being AGIX and the ETH blockchain import is showing the coin as being AGI, the two transactions will not merge.

In the “merged.png” screenshot, this is what things look like after I try to merge the two transactions from the “not merged.png” screenshot. When I tried to merge the transactions, Koinly incorrectly treats it as an exchange instead of as a transfer.

This same problem has come up multiple times over multiple transactions. I can’t edit the ETH import transactions on Koinly because they are from a blockchain import.

Which exchange/wallet is this regarding?
ETH

How did you import data into this wallet?
Blockchain Import

What have you tried to fix this so far?
Post here and hope that Koinly fixes this for me.

Edit: Actually I think I got this working by deleting the blockchain import wallets on Koinly and creating custom wallets and importing through CSVs that I generated on Etherscan.

Edit again: No, I didn’t get this working and still am hoping Koinly fixes this.