Update to InputfieldSelector to correct issue with @fields not being populated properly when saved and populated later.