OPC UA Path Based Logging - Remove top branches from naming

We are using OPC UA Path based logging in Canary. We have one dataset per PLC/Collector session. In Kepware, we use a channel per PLC. Result is that we have "Test PLC" duplicated 3 times by path based logging:

1. Canary Server Name
   1. Test PLC (dataset name)
      1. Test PLC (Kepware channel name)
         1. Test PLC (Kepware device name)
            1. Asset branch 1
            2. Asset branch 2
            3. etc....

I also tried setting up my path based logging starting from "asset branch 1" but Canary still included the channel and device in the hierarchy of the historian storage/tag picker

I worked around this by using an asset model/virtual view but I think it would be better if we can fix this at the logging level to work like we want