added autocomplete checks