Don't serialize empty control property name field.
Don't serialize empty unit field.
Don't add property name to first control.