indeed...
Other solution would be to show chassis before model for Holden and VAZ, but anyway there is no reason to absolutely want the model in chassis for VAZ, so we could do as you suggested.
Any comment from other admin before we start doing changes?