Refs #1387 Autocomplete population fix.