PIM-3369 : fix the optional two fields case for metric import