switch Field and FieldValue dependency-wise, add default value to Field