more fixing encounterform to set location ID