Fixed empty choices handling for string fields