cleaned up the autocomplete control somewhat