Fixed handling of non-unique srg field names