Adjusted ordering of fields for stamp