rearrange fuel type handling