fixed typo, and do not include null values for vehicle type