Legend ordering after CPU upgrade

I have a graph that displays CPU usage of a host and recently after upgrading it (the CPU), the core count legend is out of order. The number of logical processors went from 10 to 20 and this is the result:

Is there anyway to sort this out without dropping the measurement in Influx (which I assume it would work)?

By the way, v7.0 looks awesome :wink: