Place Subfield after Field

Change-Id: I073997ddc422a218e7c65a80ebcdadc1e7c82ee0