[OE-4735] Put validators in correct order.