add autocomplete guards