rearrange fuel_type handling