Bug 7074: (QA follow-up) Deal with multiple fields