Encounter form bug fixes.