GPII-168: Set expanded val to model value on create