Fix duplicate subfield support