improve auto data to always have correct makes and models pairs