More changes to correctly migrate new brand fields