Update measure sorting
Update measure sorting

Do the sorting once, after the join.
change the order slightly based on the new measure types we will be receiving. 
bitzesty/trade-tariff-backend,bitzesty/trade-tariff-backend,bitzesty/trade-tariff-backend