updated the way hiv_staging and hiv_clinic_registration observations are processed