Taxonomy order

[KINKCreative]

I am having an issue, I have the most recent version on a SilverStripe 5 install.
I have a taxonomy with several child taxonomies. I order them in the CMS on the children tab of the parent.

Once I tag any item with a child taxonomy, the entire order of the children changes.

I believe the "Sort" on the DataObjectTaxonomyTerm may be rewriting the "Sort" on the TaxonomyTerm as well (in some cases). I tried using a custom Sort field with an extension but it's always overriden by getCMSFields on the Taxonomy Term itself (eg instatianting the sort field twice etc).