Fixing bug where encounter forms were not saving edited demographic data