Updated autocomplete references to match questionnaires