Adds filter so only form_fields are returned when doing a get
Merge remote-tracking branch 'origin/guiRevision' into guiRevision